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>.

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 cdaf1841ef9ad4a6d18e560a37ca7d00d1f11cc1 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 14 19:35:33 2015 +0200 Ca build enfin ! C'est plein de fixme et les tests passent pas mais ca build (refs #7519) --- .../main/java/fr/ird/observe/ObserveContext.java | 373 ++++++------ .../observe/business/LonglinePositionAware.java | 56 ++ .../observe/business/db/DataSourceProvider.java | 3 +- .../report/model/operations/GroupByLength.java | 103 ---- .../report/model/operations/SumColumn.java | 132 ----- .../report/model/operations/SumIntColumn.java | 128 ---- .../report/model/operations/SumIntRow.java | 132 ----- .../business/report/model/operations/SumRow.java | 128 ---- .../validation/ValidationMessageDetector.java | 647 +++++++++++---------- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 6 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 27 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 18 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 2 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 6 +- .../observe/ui/actions/ReloadStorageAction.java | 72 +-- .../ui/actions/SaveStorageToFileAction.java | 22 +- .../ird/observe/ui/actions/ShowConfigAction.java | 199 +++---- .../observe/ui/actions/StartH2WebServerAction.java | 14 +- .../observe/ui/actions/StartServerModeAction.java | 72 +-- .../observe/ui/actions/StopH2WebServerAction.java | 11 +- .../observe/ui/actions/StopServerModeAction.java | 19 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 4 +- .../ui/actions/shared/CloseOpenUIAction.java | 4 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 7 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 9 +- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 3 + .../fr/ird/observe/ui/admin/AdminUILauncher.java | 1 + .../ird/observe/ui/admin/config/SelectDataUI.css | 2 +- .../ird/observe/ui/admin/config/SelectDataUI.jaxx | 8 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 3 +- .../observe/ui/admin/report/ReportUIHandler.java | 41 +- .../ObsoleteEntityListCellRenderer.java | 11 +- .../synchronize/ObsoleteEntityTableModel.java | 51 +- .../ui/admin/synchronize/SynchronizeModel.java | 103 ++-- .../ui/admin/synchronize/SynchronizeUI.jaxx | 9 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 27 +- .../validate/ValidateEntityListCellRenderer.java | 18 +- .../ui/admin/validate/ValidateUIHandler.java | 40 +- .../main/java/fr/ird/observe/ui/content/Common.css | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 12 +- .../ird/observe/ui/content/ContentUIHandler.java | 34 +- .../ird/observe/ui/content/ContentUIManager.java | 35 ++ .../ui/content/impl/longline/BranchlineUI.css | 42 +- .../content/impl/longline/BranchlineUIHandler.java | 5 +- .../LonglineDetailCompositionUIHandler.java | 49 +- ...onglineDetailCompositionUIValidationHelper.java | 18 +- .../impl/longline/LonglineGlobalCompositionUI.css | 6 +- .../LonglineGlobalCompositionUIHandler.java | 4 + .../impl/longline/SectionTemplatesTableModel.java | 129 ++-- .../content/impl/longline/SectionsTableModel.java | 173 +++--- .../ui/content/impl/longline/SetLonglineUI.css | 106 ++-- .../ui/content/impl/longline/SetLonglineUI.jaxx | 9 +- .../impl/longline/SetLonglineUIHandler.java | 8 +- .../impl/seine/ActivitySeineObservedSystemUI.css | 8 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 13 +- .../ActivitySeineObservedSystemUIHandler.java | 6 +- .../seine/ActivitySeineObservedSystemUIModel.java | 21 +- .../FloatingObjectTransmittingBuoyOperationUI.css | 37 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 15 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 57 +- .../ui/content/impl/seine/FloatingObjectUI.css | 12 +- .../observe/ui/content/impl/seine/SetSeineUI.css | 40 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 8 - .../ird/observe/ui/content/list/ContentListUI.jaxx | 4 +- .../ui/content/list/ContentListUIHandler.java | 16 +- .../impl/longline/ActivityLonglinesUIHandler.java | 29 +- .../ui/content/list/impl/longline/CommonListUI.css | 8 +- .../list/impl/longline/TripLonglinesUIHandler.java | 31 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 30 +- .../ui/content/list/impl/seine/CommonListUI.css | 12 +- .../content/list/impl/seine/RoutesUIHandler.java | 33 +- .../list/impl/seine/TripSeinesUIHandler.java | 34 +- .../observe/ui/content/open/ContentOpenableUI.jaxx | 2 +- .../open/impl/longline/ActivityLonglineUI.css | 23 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 7 +- .../impl/longline/ActivityLonglineUIHandler.java | 5 +- .../content/open/impl/longline/TripLonglineUI.css | 40 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 7 +- .../open/impl/longline/TripLonglineUIHandler.java | 11 +- .../ui/content/open/impl/seine/ActivitySeineUI.css | 44 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +- .../open/impl/seine/ActivitySeineUIHandler.java | 5 +- .../observe/ui/content/open/impl/seine/RouteUI.css | 6 +- .../ui/content/open/impl/seine/RouteUI.jaxx | 3 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 10 +- .../ui/content/open/impl/seine/TripSeineUI.css | 45 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 7 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../observe/ui/content/ref/ContentReferenceUI.css | 2 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 644 ++++++++++---------- .../observe/ui/content/ref/ReferenceHomeUI.jaxx | 2 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 3 +- .../ref/ReferentialContentUIInitializer.java | 17 +- .../ui/content/ref/impl/GearCaracteristicUI.css | 2 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 6 +- .../observe/ui/content/ref/impl/GearUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/HarbourUI.css | 6 +- .../ui/content/ref/impl/HarbourUIModel.java | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/PersonUI.css | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 6 +- .../fr/ird/observe/ui/content/ref/impl/SexUI.jaxx | 2 +- .../observe/ui/content/ref/impl/SpeciesListUI.css | 6 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.css | 3 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 6 +- .../ui/content/ref/impl/VesselUIHandler.java | 6 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 8 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 2 +- .../ird/observe/ui/content/table/CommonTable.css | 2 +- .../ui/content/table/ContentTableModel.java | 49 +- .../observe/ui/content/table/ContentTableUI.jaxx | 5 +- .../ui/content/table/ContentTableUIHandler.java | 359 ++++++------ .../content/table/ContentTableUIInitializer.java | 24 +- .../ui/content/table/ContentTableUIModel.java | 5 +- .../ui/content/table/ObserveContentTableUI.java | 3 +- .../table/impl/longline/BaitsCompositionUI.css | 13 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 3 +- .../impl/longline/BaitsCompositionUIHandler.java | 42 +- .../impl/longline/BaitsCompositionUIModel.java | 6 +- .../impl/longline/BranchlinesCompositionUI.css | 11 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 3 +- .../longline/BranchlinesCompositionUIHandler.java | 50 +- .../CatchLonglineContentTableUIInitializer.java | 4 +- .../table/impl/longline/CatchLonglineUI.css | 70 +-- .../table/impl/longline/CatchLonglineUI.jaxx | 11 +- .../impl/longline/CatchLonglineUIHandler.java | 548 ++++++++--------- .../ui/content/table/impl/longline/EncounterUI.css | 8 +- .../content/table/impl/longline/EncounterUI.jaxx | 2 +- .../table/impl/longline/EncounterUIHandler.java | 22 +- .../impl/longline/FloatlinesCompositionUI.css | 8 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 5 +- .../longline/FloatlinesCompositionUIHandler.java | 49 +- .../GearUseFeaturesLonglineTableModel.java | 16 +- .../impl/longline/GearUseFeaturesLonglineUI.css | 15 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 3 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 231 ++++---- .../longline/GearUseFeaturesLonglineUIModel.java | 6 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 26 +- .../table/impl/longline/HooksCompositionUI.css | 11 +- .../table/impl/longline/HooksCompositionUI.jaxx | 3 +- .../impl/longline/HooksCompositionUIHandler.java | 50 +- .../impl/longline/LonglinePositionHelper.java | 117 ++-- .../content/table/impl/longline/SensorUsedUI.css | 14 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 46 +- .../impl/longline/SizeMeasuresTableModel.java | 25 +- .../ui/content/table/impl/longline/TdrUI.css | 74 +-- .../content/table/impl/longline/TdrUIHandler.java | 103 ++-- .../impl/longline/WeightMeasuresTableModel.java | 22 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 12 +- .../GearUseFeatureMeasurementCellRenderer.java | 15 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 12 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 7 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 232 ++++---- .../impl/seine/GearUseFeaturesSeineUIModel.java | 17 +- .../content/table/impl/seine/NonTargetCatchUI.css | 21 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 17 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 391 ++++++------- .../content/table/impl/seine/NonTargetSampleUI.css | 18 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 8 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 305 +++++----- .../table/impl/seine/ObjectObservedSpeciesUI.css | 6 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 8 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 24 +- .../table/impl/seine/ObjectSchoolEstimateUI.css | 4 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 21 +- .../content/table/impl/seine/SchoolEstimateUI.css | 6 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 7 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 130 +++-- .../ui/content/table/impl/seine/TargetCatchUI.css | 8 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 11 +- .../table/impl/seine/TargetCatchUIHandler.java | 397 +++++++------ .../table/impl/seine/TargetDiscardCatchUI.css | 8 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 15 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 538 ++++++++--------- .../content/table/impl/seine/TargetSampleUI.jaxx | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 289 ++++----- .../ui/storage/StorageBackupUILauncher.java | 14 +- .../ird/observe/ui/storage/StorageUIHandler.java | 18 +- .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 4 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/RolesUI.jaxx | 2 +- .../ird/observe/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../ui/storage/tabs/StorageTabUIHandler.java | 28 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 1 - .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 5 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 1 + .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 2 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 20 +- .../EditableTableWithCacheTableModelSupport.java | 21 +- .../observe-application-swing_en_GB.properties | 181 ++++++ .../observe-application-swing_es_ES.properties | 181 ++++++ .../observe-application-swing_fr_FR.properties | 181 ++++++ ...glineDetailCompositionValidatorServiceTest.java | 139 ++--- 204 files changed, 5127 insertions(+), 4828 deletions(-) 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 7a9ccf8..df5267a 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 @@ -22,10 +22,14 @@ package fr.ird.observe; import fr.ird.observe.business.ObserveApplicationContext; -import fr.ird.observe.ui.actions.ChangeStorageAction; +import fr.ird.observe.business.ObserveServiceHelper; +import fr.ird.observe.business.db.DataSource; +import fr.ird.observe.business.db.constants.DbMode; +import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.ObserveUIMode; import fr.ird.observe.ui.UIHelper; +import fr.ird.observe.ui.actions.ChangeStorageAction; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.actions.shared.CancelCreateUIAction; import fr.ird.observe.ui.actions.shared.CloseAndCreateUIAction; @@ -39,6 +43,7 @@ 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; @@ -47,10 +52,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; -import javax.swing.ActionMap; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.util.Arrays; import java.util.List; @@ -108,7 +111,7 @@ public class ObserveContext extends ObserveApplicationContext { public static boolean isClosed() { //FIXME // return ObserveServiceHelper.isClosed(); - return null; + return false; } public ObserveConfig getConfig() { @@ -306,42 +309,43 @@ public class ObserveContext extends ObserveApplicationContext { // chargement de la base locale // création de la source de données sur la base locale - DataSource service = - ObserveServiceHelper.newLocalStorageService(getConfig()); - - // la source sera utilisée dans les ui - prepareMainStorage(service); - - if (log.isInfoEnabled()) { - log.info(t("observe.init.local.db.detected", service.getLabel())); - } - - // la base locale existe, on l'ouvre - try { - service.doOpen(); - } catch (Exception eee) { - // la base n'a pas pu être ouverte - - Throwable cause = eee.getCause(); - while (cause != null && cause.getCause() != null) { - cause = cause.getCause(); - } - if (cause != null) { - if (cause instanceof JdbcSQLException) { - JdbcSQLException error = (JdbcSQLException) cause; - if (error.getMessage().contains("Locked")) { - JOptionPane.showMessageDialog( - null, - t("observe.error.open.first.db"), - t("observe.title.error.dialog"), - JOptionPane.ERROR_MESSAGE - ); - return; - } - } - } - throw eee; - } + //FIXME +// DataSource service = +// ObserveServiceHelper.newLocalStorageService(getConfig()); +// +// // la source sera utilisée dans les ui +// prepareMainStorage(service); +// +// if (log.isInfoEnabled()) { +// log.info(t("observe.init.local.db.detected", service.getLabel())); +// } +// +// // la base locale existe, on l'ouvre +// try { +// service.doOpen(); +// } catch (Exception eee) { +// // la base n'a pas pu être ouverte +// +// Throwable cause = eee.getCause(); +// while (cause != null && cause.getCause() != null) { +// cause = cause.getCause(); +// } +// if (cause != null) { +// if (cause instanceof JdbcSQLException) { +// JdbcSQLException error = (JdbcSQLException) cause; +// if (error.getMessage().contains("Locked")) { +// JOptionPane.showMessageDialog( +// null, +// t("observe.error.open.first.db"), +// t("observe.title.error.dialog"), +// JOptionPane.ERROR_MESSAGE +// ); +// return; +// } +// } +// } +// throw eee; +// } } /** @@ -363,151 +367,152 @@ public class ObserveContext extends ObserveApplicationContext { String.valueOf(true)); } - service.addDataSourceListener(new DataSourceListenerAdapter() { - - @Override - public void onOpening(DataSourceEvent event) { - DataSource s = event.getSource(); - UIHelper.displayInfo( - t("observe.message.db.loading", s.getLabel())); - } - - @Override - public void onOpened(DataSourceEvent event) { - - // le service est disponible, on enregistre les listeners - DataSource source = event.getSource(); - - try { - openOnUI(source); - } catch (Exception e) { - - // la base n'a pas pu être chargée proprement - // ceci peut être due a une base dans une version pas - // assez recente, on doit donc refermer cette base - if (log.isErrorEnabled()) { - log.error("Could not obtain open datas from " + source.getLabel(), e); - } - ErrorDialogUI.showError(e); - - // fermeture de la source - try { - source.doClose(false); - } catch (DataSourceException e1) { - throw new RuntimeException(e1); - } - } - - } - - @Override - public void onClosing(DataSourceEvent event) { - - super.onClosing(event); - - DataSource source = event.getSource(); - - // on désenregistre la source du service de données - getDataService().unregisterDataSource(source); - - // on dettache la validation - getValidationContext().closeDataSource(); - - ObserveMainUI mainUI = getObserveMainUI(); - DataContext dataContext = getDataContext(); - dataContext.setEnabled(false); - - // suppresion des opens dans le context de données - dataContext.populateOpens(); - - mainUI.getTreeHelper().cleanNavigationUI(mainUI); - - // on met a jour l'état dans la config - getConfig().setMainStorageOpened(false); - } - - - @Override - public void onClosed(DataSourceEvent event) { - // le service est indisponible, il faut supprimer toutes les - // references vers le service - DataSource source = event.getSource(); - - // gestion JMX -// if (ObserveServiceHelper.isUseJMX()) { + //FIXME +// service.addDataSourceListener(new DataSourceListenerAdapter() { // -// dettachHibernateMBean(source); +// @Override +// public void onOpening(DataSourceEvent event) { +// DataSource s = event.getSource(); +// UIHelper.displayInfo( +// t("observe.message.db.loading", s.getLabel())); +// } +// +// @Override +// public void onOpened(DataSourceEvent event) { +// +// // le service est disponible, on enregistre les listeners +// DataSource source = event.getSource(); +// +// try { +// openOnUI(source); +// } catch (Exception e) { +// +// // la base n'a pas pu être chargée proprement +// // ceci peut être due a une base dans une version pas +// // assez recente, on doit donc refermer cette base +// if (log.isErrorEnabled()) { +// log.error("Could not obtain open datas from " + source.getLabel(), e); +// } +// ErrorDialogUI.showError(e); +// +// // fermeture de la source +// try { +// source.doClose(false); +// } catch (DataSourceException e1) { +// throw new RuntimeException(e1); +// } // } - - ObserveMainUI mainUI = getObserveMainUI(); - - // nettoyage de l'ui ( suppression navigation et autres ) - if (mainUI != null) { - - if (log.isDebugEnabled()) { - log.debug("dispose ui from storage " + - source.getLabel() + ": " + mainUI.getName()); - } - - mainUI.setMode(ObserveUIMode.NO_DB); - - UIHelper.displayInfo( - t("observe.message.db.closed", source.getLabel())); - - } - } - - protected void openOnUI(DataSource source) throws DataSourceException { - // on rend le service disponible dans le service de données - getDataService().registerDataSource(source); - - // on rend le service disponible dans le service de validation - getValidationContext().setDataSource(source); - - // toutes les données sont chargées, on peut declarer le service - // comme ouvert dans la configuration - ObserveConfig config = getConfig(); - config.setMainStorageOpened(true); - config.setMainStorageOpenedLocal(source instanceof H2DataSource); - - if (source instanceof H2DataSource) { - config.setLocalStorageExist(true); - } - - // gestion JMX -// if (ObserveServiceHelper.isUseJMX()) { -// createHibernateMBean(source); +// +// } +// +// @Override +// public void onClosing(DataSourceEvent event) { +// +// super.onClosing(event); +// +// DataSource source = event.getSource(); +// +// // on désenregistre la source du service de données +// getDataService().unregisterDataSource(source); +// +// // on dettache la validation +// getValidationContext().closeDataSource(); +// +// ObserveMainUI mainUI = getObserveMainUI(); +// DataContext dataContext = getDataContext(); +// dataContext.setEnabled(false); +// +// // suppresion des opens dans le context de données +// dataContext.populateOpens(); +// +// mainUI.getTreeHelper().cleanNavigationUI(mainUI); +// +// // on met a jour l'état dans la config +// getConfig().setMainStorageOpened(false); +// } +// +// +// @Override +// public void onClosed(DataSourceEvent event) { +// // le service est indisponible, il faut supprimer toutes les +// // references vers le service +// DataSource source = event.getSource(); +// +// // gestion JMX +//// if (ObserveServiceHelper.isUseJMX()) { +//// +//// dettachHibernateMBean(source); +//// } +// +// ObserveMainUI mainUI = getObserveMainUI(); +// +// // nettoyage de l'ui ( suppression navigation et autres ) +// if (mainUI != null) { +// +// if (log.isDebugEnabled()) { +// log.debug("dispose ui from storage " + +// source.getLabel() + ": " + mainUI.getName()); +// } +// +// mainUI.setMode(ObserveUIMode.NO_DB); +// +// UIHelper.displayInfo( +// t("observe.message.db.closed", source.getLabel())); +// // } - - // remplissage de l'ui - ObserveMainUI mainUI = getObserveMainUI(); - - if (mainUI != null) { - if (log.isDebugEnabled()) { - log.debug("loading ui for storage " + source.getLabel() + - ": " + mainUI.getName()); - } - - DataContext dataContext = mainUI.getDataContext(); - dataContext.setEnabled(true); - - ObserveTreeHelper treeHelper = mainUI.getTreeHelper(); - - treeHelper.cleanNavigationUI(mainUI); - - - String[] openIds = getDataService().getOpenIds(source); - mainUI.getDataContext().populateOpens(openIds); - treeHelper.loadNavigationUI(source, mainUI); - - mainUI.setMode(ObserveUIMode.DB); - - mainUI.getStatus().setStatus( - t("observe.message.db.loaded", source.getLabel())); - - } - } - }); +// } +// +// protected void openOnUI(DataSource source) throws DataSourceException { +// // on rend le service disponible dans le service de données +// getDataService().registerDataSource(source); +// +// // on rend le service disponible dans le service de validation +// getValidationContext().setDataSource(source); +// +// // toutes les données sont chargées, on peut declarer le service +// // comme ouvert dans la configuration +// ObserveConfig config = getConfig(); +// config.setMainStorageOpened(true); +// config.setMainStorageOpenedLocal(source instanceof H2DataSource); +// +// if (source instanceof H2DataSource) { +// config.setLocalStorageExist(true); +// } +// +// // gestion JMX +//// if (ObserveServiceHelper.isUseJMX()) { +//// createHibernateMBean(source); +//// } +// +// // remplissage de l'ui +// ObserveMainUI mainUI = getObserveMainUI(); +// +// if (mainUI != null) { +// if (log.isDebugEnabled()) { +// log.debug("loading ui for storage " + source.getLabel() + +// ": " + mainUI.getName()); +// } +// +// DataContext dataContext = mainUI.getDataContext(); +// dataContext.setEnabled(true); +// +// ObserveTreeHelper treeHelper = mainUI.getTreeHelper(); +// +// treeHelper.cleanNavigationUI(mainUI); +// +// +// String[] openIds = getDataService().getOpenIds(source); +// mainUI.getDataContext().populateOpens(openIds); +// treeHelper.loadNavigationUI(source, mainUI); +// +// mainUI.setMode(ObserveUIMode.DB); +// +// mainUI.getStatus().setStatus( +// t("observe.message.db.loaded", source.getLabel())); +// +// } +// } +// }); } // protected void createHibernateMBean(DataSource source) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java b/observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java new file mode 100644 index 0000000..a508bcb --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java @@ -0,0 +1,56 @@ +package fr.ird.observe.business; + +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 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.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.SectionDto; + +import java.beans.PropertyChangeListener; + +/** + * Created on 1/6/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.11 + */ +//FIXME +public interface LonglinePositionAware { + + void setSection(SectionDto section); + + SectionDto getSection(); + + void setBasket(BasketDto basket); + + BasketDto getBasket(); + + void setBranchline(BranchlineDto branchline); + + BranchlineDto getBranchline(); + + void addPropertyChangeListener(PropertyChangeListener listener); + + void addPropertyChangeListener(String property, PropertyChangeListener listener); + +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java index 9c45b21..405c6ab 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.business.db; -import fr.ird.observe.services.dto.migration.AbstractDataSourceMigrationDto; import org.hibernate.dialect.Dialect; import java.sql.Driver; @@ -47,7 +46,7 @@ public interface DataSourceProvider<C extends DataSourceConfig, S extends DataSo Class<? extends Driver> getDriverClass(); /** @return la classe de migration */ - Class<? extends AbstractDataSourceMigration> getMigrationClass(); +// Class<? extends AbstractDataSourceMigration> getMigrationClass(); /** @return les paramètres utilisables sur la configuration */ DataSourceConfigParam[] getParams(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/GroupByLength.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/GroupByLength.java deleted file mode 100644 index b8a946a..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/GroupByLength.java +++ /dev/null @@ -1,103 +0,0 @@ -package fr.ird.observe.business.report.model.operations; - -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2015 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.business.report.model.DataMatrix; -import fr.ird.observe.business.report.model.Report; -import fr.ird.observe.business.report.model.ReportOperation; - -import java.awt.*; -import java.util.HashSet; -import java.util.Set; - -/** - * To group by legnth (first column, second row is count). - * - * I don't know how to make this with hibernate the group by + sum does not work :(. - * - * Created on 5/23/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 4.0 - */ -public class GroupByLength extends ReportOperation { - - private static final long serialVersionUID = 1L; - - private static final String OPERATION_NAME = "GroupByLength"; - - @Override - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, incoming.getHeight()); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - Set<String> lengths = new HashSet<String>(); - for (int i = 0; i < incoming.getHeight(); i++) { - lengths.add((String) incoming.getValue(0, i)); - } - Dimension result = new Dimension(incoming.getWidth(), lengths.size()); - return result; - } - - //FIXME -// @Override -// public DataMatrix execute(TopiaContext tx, Report model, DataMatrix incoming, Map<String, Object> variables, Map<String, List<?>> repeatVariablesUniverse) { -// -// // Première passe pour grouper par classe de taille -// Map<String, MutableInt> data = new LinkedHashMap<String, MutableInt>(); -// for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { -// -// String length = (String) incoming.getValue(0, i); -// Integer count = Integer.valueOf(incoming.getValue(1, i).toString()); -// -// MutableInt mutableInt = data.get(length); -// if (mutableInt == null) { -// mutableInt = new MutableInt(); -// data.put(length, mutableInt); -// } -// mutableInt.add(count); -// -// } -// -// // Deuxième passe pour remplir la matrice -// DataMatrix result = createTmpMatrix(model, incoming); -// int row = 0; -// for (Map.Entry<String, MutableInt> entry : data.entrySet()) { -// String length = entry.getKey(); -// MutableInt mutableInt = entry.getValue(); -// result.setValue(0, row, length); -// result.setValue(1, row, mutableInt.intValue()); -// row++; -// } -// -// return result; -// } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumColumn.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumColumn.java deleted file mode 100644 index dafdeeb..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumColumn.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * #%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.business.report.model.operations; - -import fr.ird.observe.report.model.DataMatrix; -import fr.ird.observe.report.model.Report; -import fr.ird.observe.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; - - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * Opération pour calculer la somme de toutes les cellules d'une colonne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle ligne en bas - * du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumColumn extends ReportOperation { - - /** Logger */ - private static final Log log = - LogFactory.getLog(SumColumn.class); - - private static final long serialVersionUID = 1L; - - private static final String OPERATION_NAME = "SumColumn"; - - - public SumColumn() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - public DataMatrix execute(TopiaContext tx, - Report model, - DataMatrix incoming, - Map<String, Object> variables, - Map<String, List<?>> repeatVariablesUniverse) { - - if (log.isDebugEnabled()) { - log.debug("Launch " + this); - } - - // construction du resultat - - DataMatrix tmpMatrix = createTmpMatrix(model, incoming); - - for (int i = 0, nbColumns = incoming.getWidth(); i < nbColumns; i++) { - - Object result = getColumnData(i, incoming); - tmpMatrix.setValue(i, 0, result); - if (log.isDebugEnabled()) { - log.debug("objectOperation [" + i + ",0] = " + result); - } - } - - DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); - return result; - } - - protected Object getColumnData(int column, DataMatrix incoming) { - Double result = 0d; - - int nbRows = incoming.getHeight(); - - for (int row = 0; row < nbRows; row++) { - Serializable o = incoming.getValue(column, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, incoming.getHeight()); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - Dimension result = new Dimension(incoming.getWidth(), 1); - return result; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntColumn.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntColumn.java deleted file mode 100644 index b260ed5..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntColumn.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * #%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.business.report.model.operations; - -import fr.ird.observe.business.report.model.DataMatrix; -import fr.ird.observe.business.report.model.Report; -import fr.ird.observe.business.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.*; -import java.io.Serializable; - -/** - * Opération pour calculer la somme entière de toutes les cellules d'une colonne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle ligne en bas - * du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumIntColumn extends ReportOperation { - - /** Logger */ - private static final Log log = - LogFactory.getLog(SumIntColumn.class); - - private static final long serialVersionUID = 1L; - - private static final String OPERATION_NAME = "SumIntColumn"; - - - public SumIntColumn() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - //FIXME -// @Override -// public DataMatrix execute(TopiaContext tx, -// Report model, -// DataMatrix incoming, -// Map<String, Object> variables, -// Map<String, List<?>> repeatVariablesUniverse) { -// -// if (log.isDebugEnabled()) { -// log.debug("Launch " + this); -// } -// -// // construction du resultat -// -// DataMatrix tmpMatrix = createTmpMatrix(model, incoming); -// -// for (int i = 0, nbColumns = incoming.getWidth(); i < nbColumns; i++) { -// -// Object result = getColumnData(i, incoming); -// tmpMatrix.setValue(i, 0, result); -// if (log.isDebugEnabled()) { -// log.debug("objectOperation [" + i + ",0] = " + result); -// } -// } -// -// DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); -// return result; -// } - - protected Object getColumnData(int column, DataMatrix incoming) { - Double result = 0d; - - int nbRows = incoming.getHeight(); - - for (int row = 0; row < nbRows; row++) { - Serializable o = incoming.getValue(column, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result.intValue(); - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, incoming.getHeight()); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - Dimension result = new Dimension(incoming.getWidth(), 1); - return result; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntRow.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntRow.java deleted file mode 100644 index 7566a4b..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntRow.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * #%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.business.report.model.operations; - -import fr.ird.observe.report.model.DataMatrix; -import fr.ird.observe.report.model.Report; -import fr.ird.observe.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; - - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * Opération pour calculer la somme entière de toutes les cellules d'une ligne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle colonne à - * droite du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumIntRow extends ReportOperation { - - /** Logger */ - private static final Log log = LogFactory.getLog(SumIntRow.class); - - public static final String OPERATION_NAME = "SumIntRow"; - - private static final long serialVersionUID = 1L; - - public SumIntRow() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - public DataMatrix execute(TopiaContext tx, - Report model, - DataMatrix incoming, - Map<String, Object> variables, - Map<String, List<?>> repeatVariablesUniverse) { - if (log.isDebugEnabled()) { - log.debug("Launch " + this); - } - - // construction du result - - DataMatrix tmpMatrix = createTmpMatrix(model, incoming); - - for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { - - Object result = getRowData(i, incoming); - tmpMatrix.setValue(0, i, result); - if (log.isDebugEnabled()) { - log.debug("objectOperation [0, " + i + "] = " + result); - } - } - - DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); - return result; - } - - - protected Object getRowData(int row, DataMatrix incoming) { - - Double result = 0d; - - int nbColumns = incoming.getWidth(); - - for (int col = 0; col < nbColumns; col++) { - Serializable o = incoming.getValue(col, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result.intValue(); - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(incoming.getWidth(), 0); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - - Dimension result = new Dimension(1, incoming.getHeight()); - return result; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumRow.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumRow.java deleted file mode 100644 index 4153a05..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumRow.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * #%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.business.report.model.operations; - -import fr.ird.observe.business.report.model.DataMatrix; -import fr.ird.observe.business.report.model.Report; -import fr.ird.observe.business.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.*; -import java.io.Serializable; - -/** - * Opération pour calculer la somme de toutes les cellules d'une ligne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle colonne à - * droite du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumRow extends ReportOperation { - - /** Logger */ - private static final Log log = LogFactory.getLog(SumRow.class); - - public static final String OPERATION_NAME = "SumRow"; - - private static final long serialVersionUID = 1L; - - public SumRow() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - //FIXME -// @Override -// public DataMatrix execute(TopiaContext tx, -// Report model, -// DataMatrix incoming, -// Map<String, Object> variables, -// Map<String, List<?>> repeatVariablesUniverse) { -// if (log.isDebugEnabled()) { -// log.debug("Launch " + this); -// } -// -// // construction du result -// -// DataMatrix tmpMatrix = createTmpMatrix(model, incoming); -// -// for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { -// -// Object result = getRowData(i, incoming); -// tmpMatrix.setValue(0, i, result); -// if (log.isDebugEnabled()) { -// log.debug("objectOperation [0, " + i + "] = " + result); -// } -// } -// -// DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); -// return result; -// } - - - protected Object getRowData(int row, DataMatrix incoming) { - - Double result = 0d; - - int nbColumns = incoming.getWidth(); - - for (int col = 0; col < nbColumns; col++) { - Serializable o = incoming.getValue(col, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(incoming.getWidth(), 0); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - - Dimension result = new Dimension(1, incoming.getHeight()); - return result; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationMessageDetector.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationMessageDetector.java index 3cbbb24..6d0b462 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationMessageDetector.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationMessageDetector.java @@ -21,31 +21,21 @@ */ package fr.ird.observe.business.validation; -import fr.ird.observe.ObserveDAOHelper; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.business.ObserveServiceHelper; import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.services.dto.IdDto; 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. @@ -53,8 +43,7 @@ import java.util.TreeMap; * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ -public class ValidationMessageDetector implements EntityVisitor, - SimpleBeanValidatorListener { +public class ValidationMessageDetector implements SimpleBeanValidatorListener { /** Logger */ private static final Log log = @@ -63,18 +52,18 @@ public class ValidationMessageDetector implements EntityVisitor, public static final String SEPARATOR = "/"; /** le path courant depuis le depart */ - protected Deque<TopiaEntity> path; + protected Deque<IdDto> path; /** le dictionnaire des paths d'entites detectees */ - protected SortedMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> refs; +// protected SortedMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> refs; protected StringBuilder accessorExpression; - protected TopiaEntity root; + protected IdDto root; - protected TopiaEntityRef currentRef; +// protected TopiaEntityRef currentRef; - protected Set<TopiaEntity> explored; + protected Set<IdDto> explored; /** le dictionnaire des validateurs utilisables */ protected final ValidatorsMap validators; @@ -90,37 +79,39 @@ public class ValidationMessageDetector implements EntityVisitor, public ValidationMessageDetector(ValidatorsMap validators) { this.validators = validators; - path = new LinkedList<TopiaEntity>(); - explored = new HashSet<TopiaEntity>(); - refs = new TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>>(); + path = new LinkedList<IdDto>(); + explored = new HashSet<IdDto>(); + //FIXME +// refs = new TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>>(); accessorExpression = new StringBuilder(); for (SimpleBeanValidator<?> v : validators.values()) { v.setBean(null); } } - public void detectMessages(TopiaEntity... entities) { + public void detectMessages(IdDto... entities) { // try { // on reinitialise tous les validateurs // for (BeanValidator<?> v : validators.values()) { // v.setBean(null); //// v.setContextName(contextName); // } - for (TopiaEntity e : entities) { + for (IdDto e : entities) { if (log.isDebugEnabled()) { - log.debug("start for entity " + e.getTopiaId()); + log.debug("start for entity " + e.getId()); } // détection sur l'entité e - try { - e.accept(this); - } catch (TopiaException e1) { - throw new RuntimeException("could not vist entity " + e.getTopiaId(), e1); - } + //FIXME +// try { +// e.accept(this); +// } catch (TopiaException e1) { +// throw new RuntimeException("could not vist entity " + e.getTopiaId(), e1); +// } } } - @Override - public void start(TopiaEntity e) { +// @Override + public void start(IdDto e) { if (root == null) { // start come in start method since // last clear method invocation @@ -128,29 +119,30 @@ public class ValidationMessageDetector implements EntityVisitor, addPath(e, "$root", -1); } explored.add(e); - SimpleBeanValidator<TopiaEntity> validator = getValidator(e); + SimpleBeanValidator<IdDto> validator = getValidator(e); if (log.isDebugEnabled()) { - log.debug("with entity " + e.getTopiaId() + " : " + accessorExpression); + log.debug("with entity " + e.getId() + " : " + 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); - } + //FIXME +// 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) { +// @Override + public void end(IdDto e) { if (root != null && root.equals(e)) { // global visit is done root = null; @@ -159,290 +151,294 @@ public class ValidationMessageDetector implements EntityVisitor, removeEntityFromContext(e); } - private void addEntityInContext(TopiaEntity e) { + private void addEntityInContext(IdDto 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; - } + //FIXME +// 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) { + private void removeEntityFromContext(IdDto 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; - } + //FIXME +// 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, +// @Override + public void visit(IdDto e, String name, Class<?> type, Object value) { - TopiaEntity e1 = getTopiaValue(value); + IdDto 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); - } - } + //FIXME +// try { +// e1.accept(this); +// } catch (TopiaException ex) { +// if (log.isErrorEnabled()) { +// log.error(ex.getMessage(), ex); +// } +// } } finally { removePath(); } } } - @Override - public void visit(TopiaEntity e, +// @Override + public void visit(IdDto e, String name, Class<?> collectionType, Class<?> type, int index, Object value) { - TopiaEntity e1 = getTopiaValue(value); + IdDto 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); - } - } + //FIXME +// try { +// e1.accept(this); +// } catch (TopiaException ex) { +// if (log.isErrorEnabled()) { +// log.error(ex.getMessage(), ex); +// } +// } } finally { removePath(); } } } - @Override - public void visit(TopiaEntity e, +// @Override + public void visit(IdDto e, String name, Class<?> collectionType, Class<?> type, Object value) { Collection<?> cValue = (Collection<?>) value; - if (TopiaEntity.class.isAssignableFrom(type) && + if (IdDto.class.isAssignableFrom(type) && cValue != null && !cValue.isEmpty()) { int i = 0; for (Object currentValue : cValue) { @@ -451,26 +447,28 @@ public class ValidationMessageDetector implements EntityVisitor, } } - 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 + //FIXME +// 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; +// } + + //FIXME +// @Override public void clear() { path.clear(); - refs.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); + protected IdDto getTopiaValue(Object value) { + IdDto topiaEntity = (IdDto) (value != null && + value instanceof IdDto ? value : null); if (topiaEntity != null && explored.contains(topiaEntity)) { // entite deja visitee topiaEntity = null; @@ -478,31 +476,34 @@ public class ValidationMessageDetector implements EntityVisitor, return topiaEntity; } - protected <T extends TopiaEntity> SimpleBeanValidator<T> getValidator(T e) { + protected <T extends IdDto> SimpleBeanValidator<T> getValidator(T e) { Class<T> contractClass; - contractClass = (Class<T>) ObserveDAOHelper.getContractClass(e.getClass()); - return validators.getValidator(contractClass); + //FIXME +// contractClass = (Class<T>) ObserveDAOHelper.getContractClass(e.getClass()); +// return validators.getValidator(contractClass); + return null; } - protected void addPath(TopiaEntity e, String name, int index) { + protected void addPath(IdDto e, String name, int index) { path.add(e); if (accessorExpression.length() > 0) { accessorExpression.append(SEPARATOR); } accessorExpression.append(name); if (index > -1) { + //FIXME accessorExpression.append("[@topiaId=\""); - accessorExpression.append(e.getTopiaId()); + accessorExpression.append(e.getId()); accessorExpression.append("\"]"); } if (log.isTraceEnabled()) { - log.trace("add to stack : " + e.getTopiaId() + ", new size : " + + log.trace("add to stack : " + e.getId() + ", new size : " + path.size() + ", path : " + accessorExpression); } } protected void removePath() { - TopiaEntity e = path.removeLast(); + IdDto e = path.removeLast(); if (path.isEmpty()) { accessorExpression.setLength(0); } else { @@ -513,7 +514,7 @@ public class ValidationMessageDetector implements EntityVisitor, } } if (log.isTraceEnabled()) { - log.trace("remove from stack : " + e.getTopiaId() + + log.trace("remove from stack : " + e.getId() + ", new size : " + path.size() + ", path : " + accessorExpression); } @@ -530,16 +531,17 @@ public class ValidationMessageDetector implements EntityVisitor, 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); - } + //FIXME +// 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( @@ -550,7 +552,8 @@ public class ValidationMessageDetector implements EntityVisitor, if (log.isDebugEnabled()) { log.debug("add message " + message); } - list.add(message); + //FIXME +// list.add(message); } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css index 4170505..a328950 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css @@ -107,17 +107,17 @@ JSplitPane { } #menuDbLanguageFR { - action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferenceLocale.FR, t("observe.action.locale.fr"), t("observe.action.db.locale.fr.tip"))}; + action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferentialLocale.FR, t("observe.action.locale.fr"), t("observe.action.db.locale.fr.tip"))}; enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "fr_FR")}; } #menuDbLanguageUK { - action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferenceLocale.UK, t("observe.action.locale.uk"), t("observe.action.db.locale.uk.tip"))}; + action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferentialLocale.UK, t("observe.action.locale.uk"), t("observe.action.db.locale.uk.tip"))}; enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "en_GB")}; } #menuDbLanguageES { - action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferenceLocale.ES, t("observe.action.locale.es"), t("observe.action.db.locale.es.tip"))}; + action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferentialLocale.ES, t("observe.action.locale.es"), t("observe.action.db.locale.es.tip"))}; enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "es_ES")}; } 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 b95579e..dda06dc 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,10 @@ <import> fr.ird.observe.ObserveConfig fr.ird.observe.business.db.DataContext - 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.services.dto.constants.ReferentialLocale fr.ird.observe.ui.admin.AdminStep fr.ird.observe.ui.content.ContentUIManager @@ -52,6 +50,11 @@ javax.swing.JComponent javax.swing.UIManager javax.swing.Icon + + <!-- FIXME --> + <!--fr.ird.observe.services.dto.TripDto--> + <!--fr.ird.observe.services.dto.ActivityDto--> + <!--fr.ird.observe.services.dto.SetDto--> </import> <ObserveUIMode id='mode' javaBean='ObserveUIMode.NO_DB'/> @@ -154,15 +157,15 @@ void $afterCompleteSetup() { <JMenu id='menuNavigation'> <JMenuItem id='menuNavigationProgram' - onActionPerformed="getTreeHelper().selectOpenNode(this, Program.class)"/> - <JMenuItem id='menuNavigationTrip' - onActionPerformed="getTreeHelper().selectOpenNode(this, Trip.class)"/> + onActionPerformed="getTreeHelper().selectOpenNode(this, ProgramDto.class)"/> + <!--<JMenuItem id='menuNavigationTrip'--> + <!--onActionPerformed="getTreeHelper().selectOpenNode(this, Trip.class)"/>--> <JMenuItem id='menuNavigationRoute' - onActionPerformed="getTreeHelper().selectOpenNode(this, Route.class)"/> - <JMenuItem id='menuNavigationActivity' - onActionPerformed="getTreeHelper().selectOpenNode(this, Activity.class)"/> - <JMenuItem id='menuNavigationSet' - onActionPerformed="getTreeHelper().selectOpenNode(this, Set.class)"/> + onActionPerformed="getTreeHelper().selectOpenNode(this, RouteDto.class)"/> + <!--<JMenuItem id='menuNavigationActivity'--> + <!--onActionPerformed="getTreeHelper().selectOpenNode(this, Activity.class)"/>--> + <!--<JMenuItem id='menuNavigationSet'--> + <!--onActionPerformed="getTreeHelper().selectOpenNode(this, Set.class)"/>--> <JSeparator/> <JMenuItem id='menuNavigationReferentiel' onActionPerformed='getTreeHelper().selectNode("observe.common.referentiel")'/> 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 87426f2..6dd8bb9 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 @@ -21,14 +21,14 @@ */ package fr.ird.observe.ui; -import fr.ird.observe.DataService; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.impl.H2DataSource; -import fr.ird.observe.services.dto.constants.ReferenceLocaleDto; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUI; @@ -49,7 +49,6 @@ import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.Icon; import javax.swing.SwingUtilities; @@ -285,7 +284,7 @@ public class ObserveMainUIHandler { // pas d'écran selectionne return; } - ContentUIModel<? extends TopiaEntity> model = selectedUI.getModel(); + ContentUIModel<? extends AbstractObserveDto> model = selectedUI.getModel(); if (!model.isEditable()) { // modele non editable @@ -398,11 +397,12 @@ public class ObserveMainUIHandler { if (ui.getConfig().isMainStorageOpened()) { DataSource service = ObserveContext.get().getDataSource(); - if (service instanceof H2DataSource) { - icon = (Icon) ui.storageStatus.getClientProperty("localIcon"); - } else { + //FIXME +// if (service instanceof H2DataSource) { +// icon = (Icon) ui.storageStatus.getClientProperty("localIcon"); +// } else { icon = (Icon) ui.storageStatus.getClientProperty("remoteIcon"); - } +// } } else { icon = (Icon) ui.storageStatus.getClientProperty("noneIcon"); } 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 3d0b828..c48df86 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 @@ -307,7 +307,7 @@ public class UIHelper extends SwingUtil { DecoratorService decoratorService = ObserveContext.get().getDecoratorService(); Decorator<E> decorator = decoratorService.getDecoratorByType(beanClass); String beanStr; - String messageDelete; + String messageDelete = null; String type = DecoratorService.getEntityLabel(beanClass); type = t(type); 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 422913f..47d49d9 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.services.dto.constants.ReferenceLocaleDto; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.ui.*; import fr.ird.observe.ui.ObserveUICallback; import jaxx.runtime.SwingUtil; @@ -50,9 +50,9 @@ public class ChangeDbLanguageAction extends AbstractAction { private final ObserveMainUI ui; - private final ReferenceLocale newLocale; + private final ReferentialLocale newLocale; - public ChangeDbLanguageAction(ObserveMainUI ui, ReferenceLocale newLocale, String name, String description) { + public ChangeDbLanguageAction(ObserveMainUI ui, ReferentialLocale newLocale, String name, String description) { super(name, SwingUtil.getUIManagerActionIcon("i18n-" + newLocale.getLocale().getLanguage())); this.ui = ui; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java index e4543b6..9b337a8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java @@ -28,8 +28,6 @@ import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceConfig; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.DataSourceFactory; -import fr.ird.observe.business.db.impl.H2DataSourceConfig; -import fr.ird.observe.business.db.impl.PGDataSourceConfig; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; @@ -103,39 +101,43 @@ public class ReloadStorageAction extends AbstractAction { ObserveConfig appConfig = ObserveContext.get().getConfig(); - if (config instanceof H2DataSourceConfig) { - - H2DataSourceConfig h2Config = (H2DataSourceConfig) config; - h2Config.setCanMigrate(appConfig.isCanMigrateH2()); - h2Config.detectPolicy(); - } - - if (config instanceof PGDataSourceConfig) { - PGDataSourceConfig pgConfig = (PGDataSourceConfig) config; - pgConfig.setCanMigrate(appConfig.isCanMigrateObstuna()); - //TODO Should try to reconnect ? to obtain new credentials ? -// pgConfig.canConnect(); -// pgConfig.detectPolicy(); - } - try { - // creation du service - storage = - DataSourceFactory.newService(config, storage.getClass()); - - // on conserve les noeuds a selectionner - ObserveContext.get().setNodesToReselect(ids); - - // attachement a l'ui - ObserveContext.get().prepareMainStorage(storage); - - // ouverture du service - storage.doOpen(); - } catch (Exception e) { - ErrorDialogUI.showError(e); - if (log.isErrorEnabled()) { - log.error(e.getMessage(), e); - } - } + //FIXME +// if (config instanceof H2DataSourceConfig) { +// +// H2DataSourceConfig h2Config = (H2DataSourceConfig) config; +// h2Config.setCanMigrate(appConfig.isCanMigrateH2()); +// h2Config.detectPolicy(); +// } + + //FIXME +// if (config instanceof PGDataSourceConfig) { +// PGDataSourceConfig pgConfig = (PGDataSourceConfig) config; +// pgConfig.setCanMigrate(appConfig.isCanMigrateObstuna()); +// //TODO Should try to reconnect ? to obtain new credentials ? +//// pgConfig.canConnect(); +//// pgConfig.detectPolicy(); +// } + + //FIXME +// try { +// // creation du service +// storage = +// DataSourceFactory.newService(config, storage.getClass()); +// +// // on conserve les noeuds a selectionner +// ObserveContext.get().setNodesToReselect(ids); +// +// // attachement a l'ui +// ObserveContext.get().prepareMainStorage(storage); +// +// // ouverture du service +// storage.doOpen(); +// } catch (Exception e) { +// ErrorDialogUI.showError(e); +// if (log.isErrorEnabled()) { +// log.error(e.getMessage(), e); +// } +// } } finally { ui.setBusy(false); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java index 6ef073f..5d453ae 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.actions; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.impl.H2DataSourceConfig; import fr.ird.observe.ui.storage.StorageBackupUILauncher; import jaxx.runtime.SwingUtil; @@ -65,9 +64,11 @@ public class SaveStorageToFileAction extends AbstractAction { DataSource service = ObserveMainUIHandler.getStorage(); - boolean local = service.getConfig() instanceof H2DataSourceConfig; +// boolean local = service.getConfig() instanceof H2DataSourceConfig; - if (!local && !(service.canReadData() && service.canWriteData())) { + //FIXME +// if (!local && !(service.canReadData() && service.canWriteData())) { + if (!(service.canReadData() && service.canWriteData())) { UIHelper.askUser( null, t("observe.title.can.not.export.obstuna"), @@ -79,13 +80,14 @@ public class SaveStorageToFileAction extends AbstractAction { return; } - String title = local ? - t("observe.title.save.localDB") : - t("observe.title.save.remoteDB"); - - StorageBackupUILauncher launcher = - new StorageBackupUILauncher(ui, ui, title); - launcher.start(); + //FIXME +// String title = local ? +// t("observe.title.save.localDB") : +// t("observe.title.save.remoteDB"); +// +// StorageBackupUILauncher launcher = +// new StorageBackupUILauncher(ui, ui, title); +// launcher.start(); } } 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 e41ba3e..87917e6 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 @@ -22,14 +22,13 @@ package fr.ird.observe.ui.actions; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveConfigOption; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; -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; @@ -118,88 +117,90 @@ public class ShowConfigAction extends AbstractAction { } protected ObserveConfigUIBuilder buildUI(ObserveConfig config, DataSource dataSource) throws DataSourceException { - - SpeciesListTableCellEditor editor; - SpeciesListsTableCellRenderer renderer; - - if (dataSource == null) { - - editor = null; - renderer = null; - - } else { - - DataService dataService = ObserveContext.get().getDataService(); - - Decorator<SpeciesList> speciesListDecorator = dataService.getDecoratorService().getDecoratorByType(SpeciesList.class); - - // load species lists - List<SpeciesList> speciesLists = dataService.loadDecoratedEntities(dataSource, SpeciesList.class); - - Map<String, SpeciesList> speciesListMap = Entities.toIdMap(speciesLists); - - - editor = new SpeciesListTableCellEditor(speciesLists, speciesListMap, speciesListDecorator); - - - renderer = new SpeciesListsTableCellRenderer(speciesListMap, speciesListDecorator); - - } - - ObserveConfigUIBuilder helper = new ObserveConfigUIBuilder(config, editor, renderer); - - for (ObserveUICallback callback : ObserveUICallback.values()) { - helper.registerCallBack(callback); - } - - helper.setFinalizer(new MainCallBackFinalizer(ObserveUICallback.application.name())); - - helper.setCloseAction(new Runnable() { - @Override - public void run() { - ObserveMainUIHandler.restartEdit(); - } - }); - - // categorie repertoires - addDirectoriesOptions(helper); - - // categorie h2 - addH2Options(helper); - - // categorie obtuna - addObstunaOptions(helper); - - // categorie change storage - addChangeStorageOptions(helper); - - // categorie gps - addGpsOptions(helper); - - // categorie synchro - addSynchroOptions(helper); - - // categorie observations (seine) - addObservationsOptions(helper); - - if (dataSource != null) { - - // categorie speciesList (seine) - addSeineSpeciesListOptions(helper); - - // categorie speciesList (longline) - addLonglineSpeciesListOptions(helper); - - } - - // catégories map - addMapOptions(helper); - - // others - addOthersOptions(helper); - - return helper; - + //FIXME + +// SpeciesListTableCellEditor editor; +// SpeciesListsTableCellRenderer renderer; + +// if (dataSource == null) { +// +// editor = null; +// renderer = null; +// +// } else { +// +// DataService dataService = ObserveContext.get().getDataService(); +// +// Decorator<SpeciesList> speciesListDecorator = dataService.getDecoratorService().getDecoratorByType(SpeciesList.class); +// +// // load species lists +// List<SpeciesList> speciesLists = dataService.loadDecoratedEntities(dataSource, SpeciesList.class); +// +// Map<String, SpeciesList> speciesListMap = Entities.toIdMap(speciesLists); +// +// +// editor = new SpeciesListTableCellEditor(speciesLists, speciesListMap, speciesListDecorator); +// +// +// renderer = new SpeciesListsTableCellRenderer(speciesListMap, speciesListDecorator); +// +// } +// +// ObserveConfigUIBuilder helper = new ObserveConfigUIBuilder(config, editor, renderer); +// +// for (ObserveUICallback callback : ObserveUICallback.values()) { +// helper.registerCallBack(callback); +// } +// +// helper.setFinalizer(new MainCallBackFinalizer(ObserveUICallback.application.name())); +// +// helper.setCloseAction(new Runnable() { +// @Override +// public void run() { +// ObserveMainUIHandler.restartEdit(); +// } +// }); +// +// // categorie repertoires +// addDirectoriesOptions(helper); +// +// // categorie h2 +// addH2Options(helper); +// +// // categorie obtuna +// addObstunaOptions(helper); +// +// // categorie change storage +// addChangeStorageOptions(helper); +// +// // categorie gps +// addGpsOptions(helper); +// +// // categorie synchro +// addSynchroOptions(helper); +// +// // categorie observations (seine) +// addObservationsOptions(helper); +// +// if (dataSource != null) { +// +// // categorie speciesList (seine) +// addSeineSpeciesListOptions(helper); +// +// // categorie speciesList (longline) +// addLonglineSpeciesListOptions(helper); +// +// } +// +// // catégories map +// addMapOptions(helper); +// +// // others +// addOthersOptions(helper); +// +// return helper; + + return null; } protected void addDirectoriesOptions(ObserveConfigUIBuilder helper) { @@ -427,11 +428,11 @@ public class ShowConfigAction extends AbstractAction { private static final long serialVersionUID = 1L; - private final Map<String, SpeciesList> entityMap; + private final Map<String, SpeciesListDto> entityMap; - private final Decorator<SpeciesList> decorator; + private final Decorator<SpeciesListDto> decorator; - public SpeciesListsTableCellRenderer(Map<String, SpeciesList> entityMap, Decorator<SpeciesList> decorator) { + public SpeciesListsTableCellRenderer(Map<String, SpeciesListDto> entityMap, Decorator<SpeciesListDto> decorator) { this.entityMap = entityMap; this.decorator = decorator; } @@ -442,7 +443,7 @@ public class ShowConfigAction extends AbstractAction { int row, int column) { String speciesListId = String.valueOf(value); - SpeciesList speciesList = entityMap.get(speciesListId); + SpeciesListDto speciesList = entityMap.get(speciesListId); return super.getTableCellRendererComponent(table, decorator.toString(speciesList), isSelected, hasFocus, row, column); } @@ -452,23 +453,23 @@ public class ShowConfigAction extends AbstractAction { private static final long serialVersionUID = 1L; - private final Map<String, SpeciesList> entityMap; + private final Map<String, SpeciesListDto> entityMap; - private final Decorator<SpeciesList> decorator; + private final Decorator<SpeciesListDto> decorator; - protected SpeciesListTableCellEditor(List<SpeciesList> entities, - Map<String, SpeciesList> entityMap, - Decorator<SpeciesList> decorator) { + protected SpeciesListTableCellEditor(List<SpeciesListDto> entities, + Map<String, SpeciesListDto> entityMap, + Decorator<SpeciesListDto> decorator) { super(new JComboBox()); this.entityMap = entityMap; this.decorator = decorator; - final BeanFilterableComboBox<SpeciesList> component = new BeanFilterableComboBox<SpeciesList>(); + final BeanFilterableComboBox<SpeciesListDto> component = new BeanFilterableComboBox<SpeciesListDto>(); component.setI18nPrefix("observe.common."); component.setShowReset(true); - component.setBeanType(SpeciesList.class); + component.setBeanType(SpeciesListDto.class); setClickCountToStart(1); editorComponent = component; @@ -488,10 +489,10 @@ public class ShowConfigAction extends AbstractAction { public Object getCellEditorValue() { String result = null; Object selectedItem = component.getSelectedItem(); - if (SpeciesList.class.isInstance(selectedItem)) { - SpeciesList speciesList = (SpeciesList) component.getSelectedItem(); + if (SpeciesListDto.class.isInstance(selectedItem)) { + SpeciesListDto speciesList = (SpeciesListDto) component.getSelectedItem(); if (speciesList != null) { - result = speciesList.getTopiaId(); + result = speciesList.getId(); } } return result; @@ -517,7 +518,7 @@ public class ShowConfigAction extends AbstractAction { } }; - component.init((JXPathDecorator<SpeciesList>) this.decorator, entities); + component.init((JXPathDecorator<SpeciesListDto>) this.decorator, entities); } class SpeciesListListCellRenderer extends DefaultListCellRenderer { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java index ef63af4..1b54dce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java @@ -28,7 +28,6 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.tools.Server; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -76,12 +75,13 @@ public class StartH2WebServerAction extends AbstractAction { try { - Server server = Server.createWebServer("-webAllowOthers"); - server.start(); - - Server.openBrowser(server.getURL()); - - ui.setContextValue(server, ObserveMainUIHandler.H2_WEB_SERVER); + //FIXME +// Server server = Server.createWebServer("-webAllowOthers"); +// server.start(); +// +// Server.openBrowser(server.getURL()); +// +// ui.setContextValue(server, ObserveMainUIHandler.H2_WEB_SERVER); ui.setH2WebServer(true); } catch (Exception e) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java index c7a3f24..45d2fa2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java @@ -30,7 +30,6 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.tools.Server; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -83,41 +82,42 @@ public class StartServerModeAction extends AbstractAction { ui.setMode(ObserveUIMode.SERVER); - try { - - Server server = Server.createTcpServer("-tcp", - "-tcpAllowOthers", - "-ifExists", - "-baseDir", dbDirectory.getAbsolutePath(), - "-tcpDaemon", - "-tcpPort", - String.valueOf(port)); - - String url = String.format(ObserveMainUIHandler.H2_SERVER_URL_PATTERN, - server.getURL(), - dbDirectory.getAbsolutePath()); - - server.start(); - if (log.isInfoEnabled()) { - log.info("server starts at " + url); - } - - String text = t("observe.message.server.info", dbDirectory); - ui.getServerModeInfo().setText(text); - - ui.getServerModeURL().setText(url); - ui.getServerModeLogin().setText(h2Login); - ui.getServerModePassword().setText(h2Password); - - ui.setContextValue(server, ObserveMainUIHandler.H2_SERVER); - - } catch (SQLException e) { - - if (log.isErrorEnabled()) { - log.error("Could not start h2 server ", e); - } - ErrorDialogUI.showError(e); - } + //FIXME +// try { +// +// Server server = Server.createTcpServer("-tcp", +// "-tcpAllowOthers", +// "-ifExists", +// "-baseDir", dbDirectory.getAbsolutePath(), +// "-tcpDaemon", +// "-tcpPort", +// String.valueOf(port)); +// +// String url = String.format(ObserveMainUIHandler.H2_SERVER_URL_PATTERN, +// server.getURL(), +// dbDirectory.getAbsolutePath()); +// +// server.start(); +// if (log.isInfoEnabled()) { +// log.info("server starts at " + url); +// } +// +// String text = t("observe.message.server.info", dbDirectory); +// ui.getServerModeInfo().setText(text); +// +// ui.getServerModeURL().setText(url); +// ui.getServerModeLogin().setText(h2Login); +// ui.getServerModePassword().setText(h2Password); +// +// ui.setContextValue(server, ObserveMainUIHandler.H2_SERVER); +// +// } catch (SQLException e) { +// +// if (log.isErrorEnabled()) { +// log.error("Could not start h2 server ", e); +// } +// ErrorDialogUI.showError(e); +// } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java index aa25344..f405b8b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java @@ -27,7 +27,6 @@ import fr.ird.observe.ui.ObserveMainUIHandler; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.tools.Server; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -65,10 +64,12 @@ public class StopH2WebServerAction extends AbstractAction { if (log.isInfoEnabled()) { log.info("Will stop web server mode..."); } - Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_WEB_SERVER); - if (server != null) { - server.stop(); - } + + //FIXME +// Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_WEB_SERVER); +// if (server != null) { +// server.stop(); +// } ui.setH2WebServer(false); } else { if (log.isWarnEnabled()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java index a20c773..aa0311b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java @@ -28,7 +28,6 @@ import fr.ird.observe.ui.ObserveUIMode; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.tools.Server; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -65,10 +64,11 @@ public class StopServerModeAction extends AbstractAction { if (log.isInfoEnabled()) { log.info("Will stop server mode..."); } - Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_SERVER); - if (server != null) { - server.stop(); - } + //FIXME +// Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_SERVER); +// if (server != null) { +// server.stop(); +// } ui.setMode(ObserveUIMode.NO_DB); if (ui.isH2WebServer()) { @@ -85,10 +85,11 @@ public class StopServerModeAction extends AbstractAction { if (log.isInfoEnabled()) { log.info("Will stop web server mode..."); } - Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_WEB_SERVER); - if (server != null) { - server.stop(); - } + //FIXME +// Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_WEB_SERVER); +// if (server != null) { +// server.stop(); +// } ui.setH2WebServer(false); } else { if (log.isWarnEnabled()) { 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 21b76a7..250ed34 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 @@ -96,7 +96,7 @@ public class CloseAndCreateUIAction extends AbstractUIAction { ); // selection du noeud de l'activity ouverte - treeHelper.selectOpenNode(getMainUI(), ActivitySeine.class); + treeHelper.selectOpenNode(getMainUI(), ActivitySeineDto.class); // on conserve le path de l'activity TreePath path = tree.getSelectionPath(); @@ -132,7 +132,7 @@ public class CloseAndCreateUIAction extends AbstractUIAction { ); // selection du noeud de l'activity ouverte - treeHelper.selectOpenNode(getMainUI(), ActivityLongline.class); + treeHelper.selectOpenNode(getMainUI(), ActivityLonglineDto.class); // on conserve le path de l'activity TreePath path = tree.getSelectionPath(); 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 9491dc7..d9941cb 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 @@ -101,7 +101,7 @@ public class CloseOpenUIAction extends AbstractUIAction { ); // selection du noeud de l'activity ouverte - treeHelper.selectOpenNode(getMainUI(), ActivitySeine.class); + treeHelper.selectOpenNode(getMainUI(), ActivitySeineDto.class); // on conserve le path de l'activity TreePath path = tree.getSelectionPath(); @@ -143,7 +143,7 @@ public class CloseOpenUIAction extends AbstractUIAction { ); // selection du noeud de l'activity ouverte - treeHelper.selectOpenNode(getMainUI(), ActivityLongline.class); + treeHelper.selectOpenNode(getMainUI(), ActivityLonglineDto.class); // on conserve le path de l'activity TreePath path = tree.getSelectionPath(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java index 755cc19..c457766 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java @@ -22,13 +22,14 @@ package fr.ird.observe.ui.actions.shared; import fr.ird.observe.ObserveContext; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.list.ContentListUI; import fr.ird.observe.ui.content.open.ContentOpenableUI; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.JComponent; import javax.swing.SwingUtilities; @@ -81,10 +82,10 @@ public class ReOpenUIAction extends AbstractUIAction { openUI = (ContentOpenableUI<?>) ui; } else if (ui instanceof ContentListUI<?, ?>) { - TopiaEntity selectedData = + IdDto selectedData = ((ContentListUI<?, ?>) ui).getSelectedData(); - String id = selectedData.getTopiaId(); + String id = selectedData.getId(); ObserveTreeHelper treeHelper = ui.getTreeHelper(); ObserveNode selectedNode = treeHelper.getSelectedNode(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index 8dd8535..1177f43 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -29,6 +29,8 @@ import fr.ird.observe.business.SendMessageAble; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.gps.GPSService; +import fr.ird.observe.ui.admin.config.SelectDataUI; +import fr.ird.observe.ui.admin.resume.ShowResumeUI; import fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.business.validation.ValidationService; @@ -330,9 +332,10 @@ public class AdminTabUIHandler implements SendMessageAble { DataSelectionTreeSelectionModel selectionModel = tabUI.getSelectionModel(); ObserveTreeHelper helper = tabUI.getTreeHelper(); - if (log.isDebugEnabled()) { - log.debug("reload model " + selectDataModel); - } + //FIXME +// if (log.isDebugEnabled()) { +// log.debug("reload model " + selectDataModel); +// } selectionModel.clearSelection(); DataSource source = tabUI.getModel().getSafeLocalSource(true); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java index a68d1f8..e69e31d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java @@ -24,6 +24,9 @@ package fr.ird.observe.ui.admin; import fr.ird.observe.ObserveActionExecutor; import fr.ird.observe.ObserveRunner; import fr.ird.observe.ui.UIHelper; +import fr.ird.observe.ui.admin.config.ConfigUI; +import fr.ird.observe.ui.admin.resume.ShowResumeUI; +import fr.ird.observe.ui.admin.save.SaveLocalUI; import jaxx.runtime.swing.wizard.WizardUILancher; import jaxx.runtime.swing.wizard.ext.WizardExtUtil; import jaxx.runtime.swing.wizard.ext.WizardState; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java index 4f80ccb..d8dd3d9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.admin; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceConfig; +import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveUIMode; import fr.ird.observe.ui.UIHelper; import jaxx.runtime.JAXXContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css index 9aef87d..8b1dde3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css @@ -35,7 +35,7 @@ #selectionModel { selectionMode: {TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION}; - dataModel:{selectDataModel}; + //dataModel:{selectDataModel}; } #selectTreePane { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx index c275b5b..5da08ec 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx @@ -27,7 +27,6 @@ <fr.ird.observe.ui.admin.AdminTabUI> <import> - fr.ird.observe.db.model.DataSelectionModel fr.ird.observe.ui.UIHelper fr.ird.observe.ui.admin.AdminUI fr.ird.observe.ui.admin.AdminStep @@ -47,8 +46,9 @@ <fr.ird.observe.ui.admin.AdminActionModel id='stepModel' initializer='null'/> - <DataSelectionModel id='selectDataModel' - initializer='getModel().getSelectionDataModel()'/> + <!--FIXME--> + <!--<DataSelectionModel id='selectDataModel'--> + <!--initializer='getModel().getSelectionDataModel()'/>--> <DataSelectionTreeSelectionModel id='selectionModel'/> @@ -67,7 +67,7 @@ public void initUI(AdminUI ui) { @Override public void destroy() { selectionModel.clearSelection(); - selectDataModel = null; + //selectDataModel = null; super.destroy(); } ]]> 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 d650be6..ac33a66 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 @@ -325,7 +325,8 @@ public class ImportGPSUIHandler extends AdminTabUIHandler { tableModel.clear(); } else { GPSActivityTableModel activityTableModel = tabUI.activitysModel; - tableModel.init(activityTableModel.getActivityAt(row), activityTableModel.getGPSPointAt(row)); + //FIXME +// tableModel.init(activityTableModel.getActivityAt(row), activityTableModel.getGPSPointAt(row)); } } 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 426d1e3..893457c 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 @@ -213,11 +213,12 @@ public class ReportUIHandler extends AdminTabUIHandler { // avoid multi-cast return; } - DataSelectionModel value = (DataSelectionModel) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("selection model changed to " + value.getDatas()); - log.debug("IS USE DATA ? : " + value.isUseData()); - } + //FIXME +// DataSelectionModel value = (DataSelectionModel) evt.getNewValue(); +// if (log.isDebugEnabled()) { +// log.debug("selection model changed to " + value.getDatas()); +// log.debug("IS USE DATA ? : " + value.isUseData()); +// } updateSelectionModel(selectTabUI); } }); @@ -319,14 +320,15 @@ public class ReportUIHandler extends AdminTabUIHandler { // l'executeur n'est plus disponible, on ne fait rien return; } - try { - execute.populate(report, getModel().getSelectedTrip()); - } catch (RuntimeException eee) { - throw eee; - } catch (Exception eee) { - throw new IllegalStateException( - "Could not populate report " + report + " in executor", eee); - } + //FIXME +// try { +// execute.populate(report, getModel().getSelectedTrip()); +// } catch (RuntimeException eee) { +// throw eee; +// } catch (Exception eee) { +// throw new IllegalStateException( +// "Could not populate report " + report + " in executor", eee); +// } // on regénère l'ui de configuration des variables JPanel variablesPanel = tabUI.getReportVariableSelectorPanel(); @@ -434,11 +436,13 @@ public class ReportUIHandler extends AdminTabUIHandler { variables.put(ReportExecute.TRIP_ID_VARIABLE, mareeId); long startTime = TimeLog.getTime(); - data = execute.execute(variables); + //FIXME +// data = execute.execute(variables); timeLog.log(startTime, "execute", report.getName()); - if (log.isInfoEnabled()) { - log.info("Result to dispaly:\n" + data.getClipbordContent(true, true)); - } + //FIXME +// if (log.isInfoEnabled()) { +// log.info("Result to dispaly:\n" + data.getClipbordContent(true, true)); +// } } catch (Exception e) { if (log.isErrorEnabled()) { @@ -449,7 +453,8 @@ public class ReportUIHandler extends AdminTabUIHandler { } // calcul des données et contruction du tableau - model.getResultModel().populate(report, data); + //FIXME +// model.getResultModel().populate(report, data); // mise a jour du clipboard automatique si requis if (model.isAutoCopyToClipboard()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java index 8af99cd..23b99d5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java @@ -21,14 +21,13 @@ */ package fr.ird.observe.ui.admin.synchronize; -import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveContext; +import fr.ird.observe.business.DecoratorService; +import fr.ird.observe.services.dto.AbstractObserveDto; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.persistence.TopiaEntity; -import javax.swing.DefaultListCellRenderer; -import javax.swing.JList; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.util.List; import java.util.Map; @@ -56,7 +55,7 @@ public class ObsoleteEntityListCellRenderer extends DefaultListCellRenderer { boolean cellHasFocus) { Map.Entry<?, ?> entry = (Map.Entry<?, ?>) value; - TopiaEntity id = (TopiaEntity) entry.getKey(); + AbstractObserveDto id = (AbstractObserveDto) entry.getKey(); List<?> val = (List<?>) entry.getValue(); DecoratorService service = getDecoratorService(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java index 1cf07dd..6f43444 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java @@ -21,9 +21,8 @@ */ package fr.ird.observe.ui.admin.synchronize; +import fr.ird.observe.services.dto.AbstractObserveDto; import org.nuiton.i18n.I18n; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityRef; import javax.swing.table.AbstractTableModel; import java.util.ArrayList; @@ -44,12 +43,12 @@ public class ObsoleteEntityTableModel extends AbstractTableModel { protected static final Class<?>[] COLUMN_CLASSES = { Boolean.class, - TopiaEntity.class + AbstractObserveDto.class }; private static final long serialVersionUID = 1L; - protected List<TopiaEntityRef> refs; +// protected List<TopiaEntityRef> refs; protected Set<Integer> selected; @@ -69,32 +68,36 @@ public class ObsoleteEntityTableModel extends AbstractTableModel { return columnIndex == 0; } - public void initEntity(List<TopiaEntityRef> refs) { - // on nettoye toujours le model lors de l'init d'une entité - this.refs = refs; - selected.clear(); - // par defaut, on selectionne toutes les references - setSelectAll(true); - //fireTableDataChanged(); - } + //FIXME +// public void initEntity(List<TopiaEntityRef> refs) { +// // on nettoye toujours le model lors de l'init d'une entité +// this.refs = refs; +// selected.clear(); +// // par defaut, on selectionne toutes les references +// setSelectAll(true); +// //fireTableDataChanged(); +// } public List<Integer> getSelectedIndex() { return new ArrayList<Integer>(selected); } - public List<TopiaEntityRef> getSelectedRefs() { - List<TopiaEntityRef> result = new ArrayList<TopiaEntityRef>(); - if (!selected.isEmpty()) { - for (Integer i : selected) { - result.add(refs.get(i)); - } - } - return result; - } + //FIXME +// public List<TopiaEntityRef> getSelectedRefs() { +// List<TopiaEntityRef> result = new ArrayList<TopiaEntityRef>(); +// if (!selected.isEmpty()) { +// for (Integer i : selected) { +// result.add(refs.get(i)); +// } +// } +// return result; +// } @Override public int getRowCount() { - return refs == null ? 0 : refs.size(); + //FIXME +// return refs == null ? 0 : refs.size(); + return -1; } @Override @@ -108,7 +111,9 @@ public class ObsoleteEntityTableModel extends AbstractTableModel { return selected.contains(rowIndex); } if (columnIndex == 1) { - return refs.get(rowIndex); + //FIXME +// return refs.get(rowIndex); + return null; } throw new IllegalStateException("can not get value for row " + rowIndex + ", col " + columnIndex); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java index edfa6c5..e8ed354 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java @@ -24,15 +24,6 @@ package fr.ird.observe.ui.admin.synchronize; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.DiffState; -import org.nuiton.topia.persistence.util.TopiaEntityRef; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; /** * Le modèle de l'opération de synchronization de réferentiel. @@ -43,16 +34,20 @@ import java.util.SortedMap; public class SynchronizeModel extends AdminActionModel { /** le dictionnaire des références sur du référentiel */ - protected SortedMap<TopiaEntity, List<TopiaEntityRef>> obsoleteRefs; + //FIXME +// protected SortedMap<TopiaEntity, List<TopiaEntityRef>> obsoleteRefs; /** le différentiel de référentiel */ - protected DiffState.DiffStateMap diff; + //FIXME +// protected DiffState.DiffStateMap diff; /** liste des actions utilisateurs */ - protected List<SynchronizeUIHandler.ObsoleteRefReplaceAction> replaceActions; + //FIXME +// protected List<SynchronizeUIHandler.ObsoleteRefReplaceAction> replaceActions; /** Universe of entities to update and with their topiaVersion to set. */ - protected Map<TopiaEntity, Long> versionsToUpdate; + //FIXME +// protected Map<TopiaEntity, Long> versionsToUpdate; /** data source we want to synchronize. */ protected DataSource source; @@ -67,43 +62,51 @@ public class SynchronizeModel extends AdminActionModel { super(AdminStep.SYNCHRONIZE); } - public SortedMap<TopiaEntity, List<TopiaEntityRef>> getObsoleteRefs() { - return obsoleteRefs; - } - - public void setObsoleteRefs(SortedMap<TopiaEntity, List<TopiaEntityRef>> obsoleteRefs) { - this.obsoleteRefs = obsoleteRefs; - } - - public DiffState.DiffStateMap getDiff() { - return diff; - } - - public void setDiff(DiffState.DiffStateMap diff) { - this.diff = diff; - } - - public List<SynchronizeUIHandler.ObsoleteRefReplaceAction> getReplaceActions() { - if (replaceActions == null) { - replaceActions = new ArrayList<SynchronizeUIHandler.ObsoleteRefReplaceAction>(); - } - return replaceActions; - } - - public void setReplaceActions(List<SynchronizeUIHandler.ObsoleteRefReplaceAction> replaceActions) { - this.replaceActions = replaceActions; - } - - public Map<TopiaEntity, Long> getVersionsToUpdate() { - if (versionsToUpdate == null) { - versionsToUpdate = new HashMap<TopiaEntity, Long>(); - } - return versionsToUpdate; - } - - public void setVersionsToUpdate(Map<TopiaEntity, Long> versionsToUpdate) { - this.versionsToUpdate = versionsToUpdate; - } + //FIXME +// public SortedMap<TopiaEntity, List<TopiaEntityRef>> getObsoleteRefs() { +// return obsoleteRefs; +// } + + //FIXME +// public void setObsoleteRefs(SortedMap<TopiaEntity, List<TopiaEntityRef>> obsoleteRefs) { +// this.obsoleteRefs = obsoleteRefs; +// } + + //FIXME +// public DiffState.DiffStateMap getDiff() { +// return diff; +// } + + //FIXME +// public void setDiff(DiffState.DiffStateMap diff) { +// this.diff = diff; +// } + + //FIXME +// public List<SynchronizeUIHandler.ObsoleteRefReplaceAction> getReplaceActions() { +// if (replaceActions == null) { +// replaceActions = new ArrayList<SynchronizeUIHandler.ObsoleteRefReplaceAction>(); +// } +// return replaceActions; +// } + + //FIXME +// public void setReplaceActions(List<SynchronizeUIHandler.ObsoleteRefReplaceAction> replaceActions) { +// this.replaceActions = replaceActions; +// } + + //FIXME +// public Map<TopiaEntity, Long> getVersionsToUpdate() { +// if (versionsToUpdate == null) { +// versionsToUpdate = new HashMap<TopiaEntity, Long>(); +// } +// return versionsToUpdate; +// } + + //FIXME +// public void setVersionsToUpdate(Map<TopiaEntity, Long> versionsToUpdate) { +// this.versionsToUpdate = versionsToUpdate; +// } public DataSource getSource() { return source; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx index 51f5822..557ca32 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx @@ -30,8 +30,6 @@ fr.ird.observe.ui.admin.AdminUI fr.ird.observe.ui.admin.AdminStep - org.nuiton.topia.persistence.TopiaEntity - jaxx.runtime.swing.CardLayout2 jaxx.runtime.swing.wizard.ext.WizardState @@ -75,7 +73,8 @@ public void initUI(AdminUI ui) { public void destroy() { errorsSelectionModel.clearSelection(); errorsModel.removeAllElements(); - obsoleteTableModel.initEntity(null); + //FIXME + //obsoleteTableModel.initEntity(null); super.destroy(); } @@ -91,11 +90,11 @@ public void propertyChange(PropertyChangeEvent evt) { } protected void apply() { - getHandler().resolvObsoleteReferences( + /*getHandler().resolvObsoleteReferences( (TopiaEntity) obsoleteEntity, obsoleteTableModel.getSelectedRefs(), (TopiaEntity) getHandler().getSafeComboBox().getSelectedItem() - ); + );*/ } ]]> 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 d73bb4c..1fa84f1 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 @@ -121,11 +121,12 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { table, 0, UIHelper.newBooleanTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer( - table, 1, - UIHelper.newDecorateTableCellRenderer(renderer, - TopiaEntityRef.class) - ); + //FIXME +// UIHelper.setTableColumnRenderer( +// table, 1, +// UIHelper.newDecorateTableCellRenderer(renderer, +// TopiaEntityRef.class) +// ); UIHelper.setTableColumnEditor( table, 0, @@ -181,15 +182,15 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { sendMessage(t("observe.synchro.message.obsolete.entities.fixed", label)); - if (model.getObsoleteRefs().isEmpty()) { - sendMessage( - t("observe.synchro.message.all.obsolete.entities.fixed") - ); - } else { - //on recharge le dictionnaire des references - //FIXME + //FIXME +// if (model.getObsoleteRefs().isEmpty()) { +// sendMessage( +// t("observe.synchro.message.all.obsolete.entities.fixed") +// ); +// } else { +// //on recharge le dictionnaire des references // setObsoleteRefs(model.getObsoleteRefs()); - } +// } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java index 980ce13..baf70db 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java @@ -33,8 +33,6 @@ import java.beans.PropertyChangeListener; import java.util.HashMap; import java.util.Map; -import static org.nuiton.i18n.I18n.t; - public class ValidateEntityListCellRenderer extends DefaultListCellRenderer implements PropertyChangeListener { private static final long serialVersionUID = 1L; @@ -68,13 +66,15 @@ public class ValidateEntityListCellRenderer extends DefaultListCellRenderer impl } synchronized (renderCache) { renderCache.clear(); - if (model.getMessages() == null) { - return; - } - for (Class<?> klass : model.getMessageTypes()) { - String type = t(DecoratorService.getEntityLabel(klass)); - renderCache.put(klass, type); - } + //FIXME +// if (model.getMessages() == null) { +// return; +// } + //FIXME +// for (Class<?> klass : model.getMessageTypes()) { +// String type = t(DecoratorService.getEntityLabel(klass)); +// renderCache.put(klass, type); +// } } } 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 e540928..497decf 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 @@ -25,7 +25,6 @@ import com.google.common.base.Charsets; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.business.ObserveServiceHelper; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.validation.ValidationContext; import fr.ird.observe.business.validation.ValidationMessageDetector; import fr.ird.observe.business.validation.ValidationModelMode; @@ -51,7 +50,6 @@ import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; -import org.nuiton.validator.bean.simple.SimpleBeanValidators; import javax.swing.*; import java.beans.PropertyChangeEvent; @@ -60,11 +58,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Date; -import java.util.EnumSet; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.SortedMap; import java.util.concurrent.Callable; import static org.nuiton.i18n.I18n.t; @@ -134,24 +129,28 @@ public class ValidateUIHandler extends AdminTabUIHandler { // rien a faire pour le moment... return; } - DataSelectionModel selectDataModel; - selectDataModel = selectTabUI.getSelectDataModel(); + //FIXME +// DataSelectionModel selectDataModel; +// selectDataModel = selectTabUI.getSelectDataModel(); if (log.isDebugEnabled()) { log.debug("validation model changed to " + value); } switch (value) { case REFERENTIEL: - selectDataModel.setUseData(false); - selectDataModel.setUseReferentiel(true); + //FIXME +// selectDataModel.setUseData(false); +// selectDataModel.setUseReferentiel(true); break; case DATA: - selectDataModel.setUseData(true); - selectDataModel.setUseReferentiel(false); + //FIXME +// selectDataModel.setUseData(true); +// selectDataModel.setUseReferentiel(false); break; case ALL: - selectDataModel.setUseData(true); - selectDataModel.setUseReferentiel(true); + //FIXME +// selectDataModel.setUseData(true); +// selectDataModel.setUseReferentiel(true); break; } //updateModel(); @@ -215,11 +214,12 @@ public class ValidateUIHandler extends AdminTabUIHandler { DefaultListModel typeModel = tabUI.typeModel; tabUI.typeSelectionModel.clearSelection(); typeModel.clear(); - Class<?>[] classes = tabUI.getStepModel().getMessageTypes(); - classes = getDecoratorService().sortTypes(classes); - for (Class<?> e : classes) { - typeModel.addElement(e); - } + //FIXME +// Class<?>[] classes = tabUI.getStepModel().getMessageTypes(); +// classes = getDecoratorService().sortTypes(classes); +// for (Class<?> e : classes) { +// typeModel.addElement(e); +// } tabUI.typeList.setSelectedIndex(0); } @@ -611,7 +611,9 @@ public class ValidateUIHandler extends AdminTabUIHandler { if (!valid) { return t("observe.common.storage.not.valid"); } else { - return model.getCentralSourceModel().getPgConfig().getPolicyLabel(); + //FIXME +// return model.getCentralSourceModel().getPgConfig().getPolicyLabel(); + return null; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css index e9f939a..f3e4867 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css @@ -47,7 +47,7 @@ BeanComboBox { } #comment2 { - _propertyName: {CommentableEntity.PROPERTY_COMMENT}; + _propertyName: {CommentableDto.PROPERTY_COMMENT}; text:{getStringValue(bean.getComment())}; } 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 c130a47..90dfd90 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 @@ -21,7 +21,7 @@ --> <org.jdesktop.swingx.JXTitledPanel - abstract='true' genericType='E extends TopiaEntity' implements="fr.ird.observe.ui.content.ObserveContentUI<E>" + abstract='true' genericType='E extends AbstractObserveDto' implements="fr.ird.observe.ui.content.ObserveContentUI<E>" title='{getHandler().updateTitle(getContentTitle())}' contentContainer='{contentContainer}' leftDecoration='{titleLeft}' @@ -34,9 +34,8 @@ _UPDATETip='t("observe.content.mode.update.tip")'> <import> - fr.ird.observe.db.DataContext - fr.ird.observe.DataService - fr.ird.observe.db.DataSource + fr.ird.observe.business.db.DataContext + fr.ird.observe.business.db.DataSource fr.ird.observe.ObserveConfig fr.ird.observe.ObserveContext fr.ird.observe.ui.actions.shared.GoUpUIAction @@ -61,8 +60,9 @@ <SwingValidatorMessageTableModel id='errorTableModel' initializer='getContextValue(SwingValidatorMessageTableModel.class)'/> - <DataService id='dataService' - initializer='getContextValue(DataService.class)'/> + <!--FIXME--> + <!--<DataService id='dataService'--> + <!--initializer='getContextValue(DataService.class)'/>--> <DataSource id='dataSource' initializer='ObserveContext.get().getDataSource()'/> 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 5e5849d..403dac5 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 @@ -30,6 +30,7 @@ import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; @@ -607,7 +608,7 @@ public abstract class ContentUIHandler<E extends AbstractObserveDto> { protected void afterDelete() { ui.stopEdit(); removeAllMessages(ui); - if (!(getBean() instanceof ReferenceEntity)) { + if (!(getBean() instanceof ReferentialDto)) { ObserveTreeHelper treeHelper = getTreeHelper(ui); ObserveNode node = treeHelper.getSelectedNode(); @@ -616,22 +617,21 @@ public abstract class ContentUIHandler<E extends AbstractObserveDto> { } } - //FIXME -// public void gotoChild(TopiaEntity entity) { -// if (entity == null) { -// -// // rien a faire -// return; -// } -// ObserveTreeHelper treeHelper = getTreeHelper(ui); -// ObserveNode parentNode = treeHelper.getSelectedNode(); -// String id = entity.getTopiaId(); -// ObserveNode node = treeHelper.findNode(parentNode, id); -// if (log.isInfoEnabled()) { -// log.info("will go to node " + node + " for " + id); -// } -// treeHelper.selectNode(node); -// } + public void gotoChild(IdDto entity) { + if (entity == null) { + + // rien a faire + return; + } + ObserveTreeHelper treeHelper = getTreeHelper(ui); + ObserveNode parentNode = treeHelper.getSelectedNode(); + String id = entity.getId(); + ObserveNode node = treeHelper.findNode(parentNode, id); + if (log.isInfoEnabled()) { + log.info("will go to node " + node + " for " + id); + } + treeHelper.selectNode(node); + } public void addChild(Class<?> type) { ObserveTreeHelper treeHelper = getTreeHelper(ui); 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 d7f6968..6ff5652 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 @@ -25,6 +25,41 @@ 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.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.ui.tree.ObserveNode; import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css index e9746f0..42f8916 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css @@ -33,7 +33,7 @@ } #comment2 { - _tablePropertyName: {Branchline.PROPERTY_COMMENT}; + _tablePropertyName: {BranchlineDto.PROPERTY_COMMENT}; text:{getStringValue(bean.getComment())}; } @@ -49,7 +49,7 @@ #depthRecorder { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.depthRecorder"; - _propertyName:{Branchline.PROPERTY_DEPTH_RECORDER}; + _propertyName:{BranchlineDto.PROPERTY_DEPTH_RECORDER}; selected:{BooleanUtils.isTrue(bean.getDepthRecorder())}; _validatorLabel:{t("observe.branchline.depthRecorder")}; } @@ -57,7 +57,7 @@ #hookLost { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.hookLost"; - _propertyName:{Branchline.PROPERTY_HOOK_LOST}; + _propertyName:{BranchlineDto.PROPERTY_HOOK_LOST}; selected:{BooleanUtils.isTrue(bean.getHookLost())}; _validatorLabel:{t("observe.branchline.hookLost")}; } @@ -65,7 +65,7 @@ #traceCutOff { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.traceCutOff"; - _propertyName:{Branchline.PROPERTY_TRACE_CUT_OFF}; + _propertyName:{BranchlineDto.PROPERTY_TRACE_CUT_OFF}; selected:{BooleanUtils.isTrue(bean.getTraceCutOff())}; _validatorLabel:{t("observe.branchline.traceCutOff")}; } @@ -73,7 +73,7 @@ #timer { text:"observe.branchline.timer"; horizontalTextPosition:{JCheckBox.LEFT}; - _propertyName:{Branchline.PROPERTY_TIMER}; + _propertyName:{BranchlineDto.PROPERTY_TIMER}; selected:{BooleanUtils.isTrue(bean.getTimer())}; _validatorLabel:{t("observe.branchline.timer")}; } @@ -85,7 +85,7 @@ #timeSinceContact { enabled:{BooleanUtils.isTrue(bean.getTimer())}; - property:{Branchline.PROPERTY_TIME_SINCE_CONTACT}; + property:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; model:{bean.getTimeSinceContact()}; numberPattern:{fr.ird.observe.ui.UIHelper.LONG_10_DIGITS_PATTERN}; _validatorLabel:{t("observe.branchline.timeSinceContact")}; @@ -100,9 +100,11 @@ enabled:{BooleanUtils.isTrue(bean.getTimer())}; label:{t("observe.branchline.timerTimeOnBoard")}; date:{bean.getTimerTimeOnBoard()}; - propertyDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD}; - propertyDayDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; - propertyTimeDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; + propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; + //FIXME + //propertyDayDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; + //FIXME + //propertyTimeDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; _validatorLabel:{t("observe.branchline.timerTimeOnBoard")}; } @@ -112,7 +114,7 @@ } #topType { - property:{Branchline.PROPERTY_TOP_TYPE}; + property:{BranchlineDto.PROPERTY_TOP_TYPE}; selectedItem:{bean.getTopType()}; _validatorLabel:{t("observe.branchline.topType")}; } @@ -123,7 +125,7 @@ } #tracelineType { - property:{Branchline.PROPERTY_TRACELINE_TYPE}; + property:{BranchlineDto.PROPERTY_TRACELINE_TYPE}; selectedItem:{bean.getTracelineType()}; _validatorLabel:{t("observe.branchline.tracelineType")}; } @@ -131,7 +133,7 @@ #weightedSwivel { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.weightedSwivel"; - _propertyName:{Branchline.PROPERTY_WEIGHTED_SWIVEL}; + _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SWIVEL}; selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; _validatorLabel:{t("observe.branchline.weightedSwivel")}; } @@ -143,7 +145,7 @@ #swivelWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; - property:{Branchline.PROPERTY_SWIVEL_WEIGHT}; + property:{BranchlineDto.PROPERTY_SWIVEL_WEIGHT}; model:{bean.getSwivelWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.branchline.swivelWeight")}; @@ -152,7 +154,7 @@ #weightedSnap { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.weightedSnap"; - _propertyName:{Branchline.PROPERTY_WEIGHTED_SNAP}; + _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SNAP}; selected:{BooleanUtils.isTrue(bean.getWeightedSnap())}; _validatorLabel:{t("observe.branchline.weightedSnap")}; } @@ -164,7 +166,7 @@ #snapWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())}; - property:{Branchline.PROPERTY_SNAP_WEIGHT}; + property:{BranchlineDto.PROPERTY_SNAP_WEIGHT}; model:{bean.getSnapWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.branchline.snapWeight")}; @@ -196,7 +198,7 @@ } #hookSize { - property:{Branchline.PROPERTY_HOOK_SIZE}; + property:{BranchlineDto.PROPERTY_HOOK_SIZE}; selectedItem:{bean.getHookSize()}; _validatorLabel:{t("observe.branchline.hookSize")}; } @@ -207,7 +209,7 @@ } #hookOffset { - property:{Branchline.PROPERTY_HOOK_OFFSET}; + property:{BranchlineDto.PROPERTY_HOOK_OFFSET}; model:{bean.getHookOffset()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.branchline.hookOffset")}; @@ -219,7 +221,7 @@ } #baitSettingStatus { - property:{Branchline.PROPERTY_BAIT_SETTING_STATUS}; + property:{BranchlineDto.PROPERTY_BAIT_SETTING_STATUS}; selectedItem:{bean.getBaitSettingStatus()}; _validatorLabel:{t("observe.branchline.baitSettingStatus")}; } @@ -230,7 +232,7 @@ } #baitHaulingStatus { - property:{Branchline.PROPERTY_BAIT_HAULING_STATUS}; + property:{BranchlineDto.PROPERTY_BAIT_HAULING_STATUS}; selectedItem:{bean.getBaitHaulingStatus()}; _validatorLabel:{t("observe.branchline.baitHaulingStatus")}; } @@ -241,7 +243,7 @@ } #baitType { - property:{Branchline.PROPERTY_BAIT_TYPE}; + property:{BranchlineDto.PROPERTY_BAIT_TYPE}; selectedItem:{bean.getBaitType()}; _validatorLabel:{t("observe.branchline.baitType")}; } 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 e9b0abe..cd024cf 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 @@ -203,8 +203,9 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { BranchlineUI.BINDING_BAIT_SETTING_STATUS_SELECTED_ITEM, BranchlineUI.BINDING_BAIT_HAULING_STATUS_SELECTED_ITEM, - BranchlineUI.BINDING_HOOK_TYPE_SELECTED_ITEM, - BranchlineUI.BINDING_HOOK_SIZE_SELECTED_ITEM, + //FIXME +// BranchlineUI.BINDING_HOOK_TYPE_SELECTED_ITEM, +// BranchlineUI.BINDING_HOOK_SIZE_SELECTED_ITEM, BranchlineUI.BINDING_HOOK_OFFSET_MODEL, BranchlineUI.BINDING_TIMER_SELECTED, 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 3253d6e..c4fd323 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 @@ -94,7 +94,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong @Override public void tableChanged(TableModelEvent e) { SectionsTableModel source = (SectionsTableModel) e.getSource(); - onSectionsTableModelChanged(source.getData()); + //FIXME +// onSectionsTableModelChanged(source.getData()); } }; @@ -237,8 +238,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong basketAdjusting = true; try { - BasketDto previousValue = (Basket) evt.getOldValue(); - BasketDto newValue = (Basket) evt.getNewValue(); + BasketDto previousValue = (BasketDto) evt.getOldValue(); + BasketDto newValue = (BasketDto) evt.getNewValue(); onSelectedBasketChanged(previousValue, newValue); } finally { @@ -418,7 +419,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong // getModel().setCanGenerate(bean.isSectionEmpty()); // TODO Use a cache of templates on setLongline (session scope) - getSectionTemplatesTableModel().setData(Collections.<SectionTemplate>emptyList()); + //FIXME +// getSectionTemplatesTableModel().setData(Collections.<SectionTemplate>emptyList()); BranchlineUI branchlineDetailUI = getUi().getBranchlineDetailUI(); branchlineDetailUI.edit(null); @@ -826,11 +828,12 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong if (!selectionEmpty) { - SectionTemplate data = getSectionTemplatesTableModel().getSelectedRow(); - - if (log.isInfoEnabled()) { - log.info("Delete: " + data); - } + //FIXME +// SectionTemplate data = getSectionTemplatesTableModel().getSelectedRow(); +// +// if (log.isInfoEnabled()) { +// log.info("Delete: " + data); +// } ObserveMainUI mainUI = ObserveContext.get().getObserveMainUI(); int response = UIHelper.askUser(mainUI, @@ -961,7 +964,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - boolean accept = UIHelper.confirmForEntityDelete(ui, Basket.class, selectedBasket); + boolean accept = UIHelper.confirmForEntityDelete(ui, BasketDto.class, selectedBasket); ObserveMainUI mainUI = ObserveContext.get().getObserveMainUI(); mainUI.setBusy(false); @@ -978,7 +981,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong try { - getSectionsTableModel().getSelectedRow().removeBasket(selectedBasket); + //FIXME +// getSectionsTableModel().getSelectedRow().removeBasket(selectedBasket); tableModel.removeSelectedRow(); } finally { @@ -1037,7 +1041,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong // if (selectedSection.isBasketEmpty()) { // selectedSection.setBasket(new ArrayList<Basket>()); // } - getSectionsTableModel().getSelectedRow().getBasket().add(selectedRowIndex, newBasket); +// getSectionsTableModel().getSelectedRow().getBasket().add(selectedRowIndex, newBasket); } finally { @@ -1068,7 +1072,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - boolean accept = UIHelper.confirmForEntityDelete(ui, Branchline.class, selectedBranchline); + boolean accept = UIHelper.confirmForEntityDelete(ui, BranchlineDto.class, selectedBranchline); ObserveMainUI mainUI = ObserveContext.get().getObserveMainUI(); mainUI.setBusy(false); if (!accept) { @@ -1114,7 +1118,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong if (selectedBasket.isBranchlineEmpty()) { selectedBasket.setBranchline(new LinkedHashSet<BranchlineDto>()); } - selectedBasket.getBranchline().add(selectedRowIndex, newBranchline); + //FIXME +// selectedBasket.getBranchline().add(selectedRowIndex, newBranchline); } finally { @@ -1140,7 +1145,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong if (selectedBasket.isBranchlineEmpty()) { selectedBasket.setBranchline(new LinkedHashSet<BranchlineDto>()); } - selectedBasket.getBranchline().add(selectedRowIndex, newBranchline); + //FIXME +// selectedBasket.getBranchline().add(selectedRowIndex, newBranchline); } finally { @@ -1213,11 +1219,12 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - List<BasketDto> baskets = newSection == null ? null : newSection.getBasket(); - if (baskets == null) { - baskets = Collections.emptyList(); - } - getBasketsTableModel().setData(baskets); + //FIXME +// List<BasketDto> baskets = newSection == null ? null : newSection.getBasket(); +// if (baskets == null) { +// baskets = Collections.emptyList(); +// } +// getBasketsTableModel().setData(baskets); } finally { @@ -1287,7 +1294,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } List<BranchlineDto> branchlines = new ArrayList<>(); - if (newBasket =! null && newBasket.getBranchline() != null) { + if (newBasket != null && newBasket.getBranchline() != null) { branchlines.addAll(newBasket.getBranchline()); } getBranchlinesTableModel().setData(branchlines); 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 3d6bf7e..600924d 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 @@ -102,15 +102,15 @@ public class LonglineDetailCompositionUIValidationHelper { if (log.isInfoEnabled()) { log.info("Rebuild messages, section model changes."); } - - List<SectionWithTemplate> notEmptyData = model.getSectionsTableModel().getNotEmptyData(); - List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); - - removeOldMessages(); - - errorTableModel.addMessages(messages); - - model.setCompositionTabValid(messages.isEmpty()); +//FIXME +// List<SectionWithTemplate> notEmptyData = model.getSectionsTableModel().getNotEmptyData(); +// List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); +// +// removeOldMessages(); +// +// errorTableModel.addMessages(messages); +// +// model.setCompositionTabValid(messages.isEmpty()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css index 4897832..20825f8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css @@ -53,8 +53,10 @@ #mitigationType { bean:{bean}; - property: {SetLongline.PROPERTY_MITIGATION_TYPE}; - selected:{bean.getMitigationType()}; + //FIXME + //property: {SetLonglineDto.PROPERTY_MITIGATION_TYPE}; + //FIXME + //selected:{bean.getMitigationType()}; _validatorLabel: {t("observe.longlineGlobalComposition.mitigationType")}; showListLabel: true; universeLabel:{t("observe.longlineGlobalComposition.availableMitigationType")}; 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 d57d350..ff2e4c1 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 @@ -29,6 +29,10 @@ 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; +import fr.ird.observe.ui.content.table.impl.longline.BranchlinesCompositionUI; +import fr.ird.observe.ui.content.table.impl.longline.FloatlinesCompositionUI; +import fr.ird.observe.ui.content.table.impl.longline.HooksCompositionUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; 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 fe69c21..6a91680 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,9 +22,8 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.services.dto.longline.SectionTemplateDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.util.table.EditableTableModelSupport; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +37,7 @@ import java.util.Set; * @since 3.10 */ //FIXME -public class SectionTemplatesTableModel extends EditableTableModelSupport<SectionTemplate> { +public class SectionTemplatesTableModel extends EditableTableModelSupport<IdDto> {//FIXME <SectionTemplate> { private static final long serialVersionUID = 1L; @@ -50,20 +49,24 @@ public class SectionTemplatesTableModel extends EditableTableModelSupport<Sectio } @Override - public boolean isRowNotEmpty(SectionTemplate row) { - return !(StringUtils.isBlank(row.getId()) && StringUtils.isBlank(row.getFloatlineLengths())); + public boolean isRowNotEmpty(IdDto row) { + //FIXME +// return !(StringUtils.isBlank(row.getId()) && StringUtils.isBlank(row.getFloatlineLengths())); + return false; } @Override - public boolean isRowValid(SectionTemplate row) { - return StringUtils.isNotBlank(row.getId()) && - StringUtils.isNotBlank(row.getFloatlineLengths()) && - row.isFloatlineLengthsValid(); + public boolean isRowValid(IdDto row) { + //FIXME +// return StringUtils.isNotBlank(row.getId()) && +// StringUtils.isNotBlank(row.getFloatlineLengths()) && +// row.isFloatlineLengthsValid(); + return false; } @Override - protected SectionTemplate createNewRow() { - return new SectionTemplate(); + protected IdDto createNewRow() { + return null; } @Override @@ -74,48 +77,51 @@ public class SectionTemplatesTableModel extends EditableTableModelSupport<Sectio @Override public Object getValueAt(int rowIndex, int columnIndex) { - SectionTemplate measure = data.get(rowIndex); - Object result; - - switch (columnIndex) { - case 0: - - result = measure.getId(); - break; - - case 1: - - result = measure.getFloatlineLengths(); - break; - - default: - throw new IllegalStateException("Can't come here"); - } - - return result; - + //FIXME +// SectionTemplate measure = data.get(rowIndex); +// Object result; +// +// switch (columnIndex) { +// case 0: +// +// result = measure.getId(); +// break; +// +// case 1: +// +// result = measure.getFloatlineLengths(); +// break; +// +// default: +// throw new IllegalStateException("Can't come here"); +// } +// +// return result; + + return null; } @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - SectionTemplate measure = data.get(rowIndex); - - switch (columnIndex) { - case 0: - - measure.setId((String) aValue); - break; - - case 1: - - measure.setFloatlineLengths((String) aValue); - break; - - default: - throw new IllegalStateException("Can't come here"); - } - + //FIXME +// SectionTemplate measure = data.get(rowIndex); +// +// switch (columnIndex) { +// case 0: +// +// measure.setId((String) aValue); +// break; +// +// case 1: +// +// measure.setFloatlineLengths((String) aValue); +// break; +// +// default: +// throw new IllegalStateException("Can't come here"); +// } +// setModified(true); } @@ -128,19 +134,20 @@ public class SectionTemplatesTableModel extends EditableTableModelSupport<Sectio // check that we are using unique ids Set<String> ids = new HashSet<String>(); - for (SectionTemplate sectionTemplate : data) { - - boolean add = ids.add(sectionTemplate.getId()); - if (!add) { - - if (log.isWarnEnabled()) { - log.warn("Template identifiants (" + sectionTemplate.getId() + ") are not unique."); - } - newValidState = false; - break; - } - - } + //FIXME +// for (SectionTemplate sectionTemplate : data) { +// +// boolean add = ids.add(sectionTemplate.getId()); +// if (!add) { +// +// if (log.isWarnEnabled()) { +// log.warn("Template identifiants (" + sectionTemplate.getId() + ") are not unique."); +// } +// newValidState = false; +// break; +// } +// +// } } return newValidState; 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 c0164cd..f9c9600 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,6 +22,7 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ +import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -32,7 +33,7 @@ import org.apache.commons.logging.LogFactory; * @since 3.10 */ //FIXME -public class SectionsTableModel extends LonglineCompositionTableModelSupport<SectionWithTemplate> { +public class SectionsTableModel extends LonglineCompositionTableModelSupport<IdDto> {//FIXME <SectionWithTemplate> { public static final String TEMPLATE_PROPERTY = "template"; @@ -46,8 +47,12 @@ public class SectionsTableModel extends LonglineCompositionTableModelSupport<Sec } @Override - protected SectionWithTemplate createNewRow() { - return new SectionWithTemplateImpl(); + //FIXME +// protected SectionWithTemplate createNewRow() { +// return new SectionWithTemplateImpl(); +// } + protected IdDto createNewRow() { + return null; } @Override @@ -92,91 +97,91 @@ public class SectionsTableModel extends LonglineCompositionTableModelSupport<Sec @Override public Object getValueAt(int rowIndex, int columnIndex) { - SectionWithTemplate row = data.get(rowIndex); - Object result; - - switch (columnIndex) { - case 0: - - result = row.getSettingIdentifier(); - break; - - case 1: - - result = row.getHaulingIdentifier(); - break; - - case 2: - - result = row.getSectionTemplate(); - break; - - default: - throw new IllegalStateException("Can't come here"); - } - - return result; - + //FIXME +// SectionWithTemplate row = data.get(rowIndex); +// Object result; +// +// switch (columnIndex) { +// case 0: +// +// result = row.getSettingIdentifier(); +// break; +// +// case 1: +// +// result = row.getHaulingIdentifier(); +// break; +// +// case 2: +// +// result = row.getSectionTemplate(); +// break; +// +// default: +// throw new IllegalStateException("Can't come here"); +// } +// +// return result; +return null; } @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - - SectionWithTemplate row = data.get(rowIndex); - - switch (columnIndex) { - case 0: - - row.setSettingIdentifier((Integer) aValue); - setModified(true); - break; - - case 1: - - row.setHaulingIdentifier((Integer) aValue); - setModified(true); - break; - - case 2: - - SectionTemplate sectionTemplate = (SectionTemplate) aValue; - - boolean changeTemplate = true; - - if (sectionTemplate != null) { - - // check if can use this template - int basketsCount = row.sizeBasket(); - boolean compiliantWithBasketCount = sectionTemplate.isCompiliantWithBasketCount(basketsCount); - - if (!compiliantWithBasketCount) { - - // We can't use this value - if (log.isWarnEnabled()) { - log.warn("sectionTemplate " + sectionTemplate + " is not compliant with basketCount: " + basketsCount); - } - //TODO Send user a message - - changeTemplate = false; - - } - - } - - if (changeTemplate) { - - SectionTemplate previousSectionTemplate = row.getSectionTemplate(); - row.setSectionTemplate(sectionTemplate); - firePropertyChange(TEMPLATE_PROPERTY, previousSectionTemplate, sectionTemplate); - - } - - break; - - default: - throw new IllegalStateException("Can't come here"); - } - +//FIXME +// SectionWithTemplate row = data.get(rowIndex); +// +// switch (columnIndex) { +// case 0: +// +// row.setSettingIdentifier((Integer) aValue); +// setModified(true); +// break; +// +// case 1: +// +// row.setHaulingIdentifier((Integer) aValue); +// setModified(true); +// break; +// +// case 2: +// +// SectionTemplate sectionTemplate = (SectionTemplate) aValue; +// +// boolean changeTemplate = true; +// +// if (sectionTemplate != null) { +// +// // check if can use this template +// int basketsCount = row.sizeBasket(); +// boolean compiliantWithBasketCount = sectionTemplate.isCompiliantWithBasketCount(basketsCount); +// +// if (!compiliantWithBasketCount) { +// +// // We can't use this value +// if (log.isWarnEnabled()) { +// log.warn("sectionTemplate " + sectionTemplate + " is not compliant with basketCount: " + basketsCount); +// } +// //TODO Send user a message +// +// changeTemplate = false; +// +// } +// +// } +// +// if (changeTemplate) { +// +// SectionTemplate previousSectionTemplate = row.getSectionTemplate(); +// row.setSectionTemplate(sectionTemplate); +// firePropertyChange(TEMPLATE_PROPERTY, previousSectionTemplate, sectionTemplate); +// +// } +// +// break; +// +// default: +// throw new IllegalStateException("Can't come here"); +// } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css index 79ffc52..fb9033f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css @@ -43,12 +43,12 @@ #homeId { text: {getStringValue(bean.getHomeId())}; - _propertyName: {SetLongline.PROPERTY_HOME_ID}; + _propertyName: {SetLonglineDto.PROPERTY_HOME_ID}; _validatorLabel:{t("observe.setLongline.homeId")}; } #resetHomeId { - _resetPropertyName: {SetLongline.PROPERTY_HOME_ID}; + _resetPropertyName: {SetLonglineDto.PROPERTY_HOME_ID}; toolTipText:"observe.setLongline.action.reset.homeId.tip"; } @@ -58,7 +58,7 @@ } #number { - property: {SetLongline.PROPERTY_NUMBER}; + property: {SetLonglineDto.PROPERTY_NUMBER}; model:{bean.getNumber()}; useFloat:false; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; @@ -68,9 +68,9 @@ #settingStartTimeStamp { label:{t("observe.setLongline.settingStartTimeStamp")}; date:{bean.getSettingStartTimeStamp()}; - propertyDate: {SetLongline.PROPERTY_SETTING_START_TIME_STAMP}; - propertyDayDate: {SetLongline.PROPERTY_SETTING_START_DATE}; - propertyTimeDate: {SetLongline.PROPERTY_SETTING_START_TIME}; + propertyDate: {SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP}; + //propertyDayDate: {SetLonglineDto.PROPERTY_SETTING_START_DATE}; + //propertyTimeDate: {SetLonglineDto.PROPERTY_SETTING_START_TIME}; _validatorLabel:{t("observe.setLongline.settingStartTimeStamp")}; } @@ -79,21 +79,21 @@ } #settingStartCoordinates { - propertyLatitude:{SetLongline.PROPERTY_SETTING_START_LATITUDE}; - propertyLongitude:{SetLongline.PROPERTY_SETTING_START_LONGITUDE}; - /*propertyQuadrant:{SetLongline.PROPERTY_SETTING_START_QUADRANT};*/ + propertyLatitude:{SetLonglineDto.PROPERTY_SETTING_START_LATITUDE}; + propertyLongitude:{SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE}; + /*propertyQuadrant:{SetLonglineDto.PROPERTY_SETTING_START_QUADRANT};*/ latitude:{bean.getSettingStartLatitude()}; longitude:{bean.getSettingStartLongitude()}; - quadrant:{bean.getSettingStartQuadrant()}; + //quadrant:{bean.getSettingStartQuadrant()}; _validatorLabel:{t("observe.setLongline.settingStartCoordinates")}; } #settingEndTimeStamp { label:{t("observe.setLongline.settingEndTimeStamp")}; date:{bean.getSettingEndTimeStamp()}; - propertyDate: {SetLongline.PROPERTY_SETTING_END_TIME_STAMP}; - propertyDayDate: {SetLongline.PROPERTY_SETTING_END_DATE}; - propertyTimeDate: {SetLongline.PROPERTY_SETTING_END_TIME}; + propertyDate: {SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP}; + //propertyDayDate: {SetLonglineDto.PROPERTY_SETTING_END_DATE}; + //propertyTimeDate: {SetLonglineDto.PROPERTY_SETTING_END_TIME}; _validatorLabel:{t("observe.setLongline.settingEndTimeStamp")}; } @@ -102,12 +102,12 @@ } #settingEndCoordinates { - propertyLatitude:{SetLongline.PROPERTY_SETTING_END_LATITUDE}; - propertyLongitude:{SetLongline.PROPERTY_SETTING_END_LONGITUDE}; - /*propertyQuadrant:{SetLongline.PROPERTY_SETTING_END_QUADRANT};*/ + propertyLatitude:{SetLonglineDto.PROPERTY_SETTING_END_LATITUDE}; + propertyLongitude:{SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE}; + /*propertyQuadrant:{SetLonglineDto.PROPERTY_SETTING_END_QUADRANT};*/ latitude:{bean.getSettingEndLatitude()}; longitude:{bean.getSettingEndLongitude()}; - quadrant:{bean.getSettingEndQuadrant()}; + //quadrant:{bean.getSettingEndQuadrant()}; _validatorLabel:{t("observe.setLongline.settingEndCoordinates")}; } @@ -126,7 +126,7 @@ } #settingVesselSpeed { - property:{SetLongline.PROPERTY_SETTING_VESSEL_SPEED}; + property:{SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED}; model:{bean.getSettingVesselSpeed()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.setLongline.settingVesselSpeed")}; @@ -135,7 +135,7 @@ #shooterUsed { text:"observe.setLongline.shooterUsed"; horizontalTextPosition:{JCheckBox.LEFT}; - _propertyName:{SetLongline.PROPERTY_SHOOTER_USED}; + _propertyName:{SetLonglineDto.PROPERTY_SHOOTER_USED}; selected:{BooleanUtils.isTrue(bean.getShooterUsed())}; } @@ -146,7 +146,7 @@ #shooterSpeed { enabled:{BooleanUtils.isTrue(bean.getShooterUsed())}; - property:{SetLongline.PROPERTY_SHOOTER_SPEED}; + property:{SetLonglineDto.PROPERTY_SHOOTER_SPEED}; model:{bean.getShooterSpeed()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.setLongline.shooterSpeed")}; @@ -158,7 +158,7 @@ } #settingShape { - property:{SetLongline.PROPERTY_SETTING_SHAPE}; + property:{SetLonglineDto.PROPERTY_SETTING_SHAPE}; selectedItem:{bean.getSettingShape()}; _validatorLabel:{t("observe.setLongline.settingShape")}; } @@ -166,7 +166,7 @@ #weightedSwivel { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.setLongline.weightedSwivel"; - _propertyName:{SetLongline.PROPERTY_WEIGHTED_SWIVEL}; + _propertyName:{SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL}; selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; _validatorLabel:{t("observe.setLongline.weightedSwivel")}; } @@ -178,7 +178,7 @@ #swivelWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; - property:{SetLongline.PROPERTY_SWIVEL_WEIGHT}; + property:{SetLonglineDto.PROPERTY_SWIVEL_WEIGHT}; model:{bean.getSwivelWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.setLongline.swivelWeight")}; @@ -187,7 +187,7 @@ #weightedSnap { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.setLongline.weightedSnap"; - _propertyName:{SetLongline.PROPERTY_WEIGHTED_SNAP}; + _propertyName:{SetLonglineDto.PROPERTY_WEIGHTED_SNAP}; selected:{BooleanUtils.isTrue(bean.getWeightedSnap())}; _validatorLabel:{t("observe.setLongline.weightedSnap")}; } @@ -199,7 +199,7 @@ #snapWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())}; - property:{SetLongline.PROPERTY_SNAP_WEIGHT}; + property:{SetLonglineDto.PROPERTY_SNAP_WEIGHT}; model:{bean.getSnapWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.setLongline.snapWeight")}; @@ -211,7 +211,7 @@ } #lineType { - property:{SetLongline.PROPERTY_LINE_TYPE}; + property:{SetLonglineDto.PROPERTY_LINE_TYPE}; selectedItem:{bean.getLineType()}; _validatorLabel:{t("observe.setLongline.lineType")}; } @@ -222,7 +222,7 @@ } #maxDepthTargeted { - property:{SetLongline.PROPERTY_MAX_DEPTH_TARGETED}; + property:{SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED}; model:{bean.getMaxDepthTargeted()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.maxDepthTargeted")}; @@ -231,7 +231,7 @@ #monitored { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.setLongline.monitored"; - _propertyName:{SetLongline.PROPERTY_MONITORED}; + _propertyName:{SetLonglineDto.PROPERTY_MONITORED}; selected:{BooleanUtils.isTrue(bean.getMonitored())}; _validatorLabel:{t("observe.setLongline.monitored")}; } @@ -242,7 +242,7 @@ } #lightsticksType { - property:{SetLongline.PROPERTY_LIGHTSTICKS_TYPE}; + property:{SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE}; selectedItem:{bean.getLightsticksType()}; _validatorLabel:{t("observe.setLongline.lightsticksType")}; } @@ -253,7 +253,7 @@ } #lightsticksColor { - property:{SetLongline.PROPERTY_LIGHTSTICKS_COLOR}; + property:{SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR}; selectedItem:{bean.getLightsticksColor()}; _validatorLabel:{t("observe.setLongline.lightsticksColor")}; } @@ -264,7 +264,7 @@ } #timeBetweenHooks { - property:{SetLongline.PROPERTY_TIME_BETWEEN_HOOKS}; + property:{SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS}; model:{bean.getTimeBetweenHooks()}; modelType:{Long.class}; numberPattern:{fr.ird.observe.ui.UIHelper.LONG_10_DIGITS_PATTERN}; @@ -277,7 +277,7 @@ } #lightsticksPerBasketCount { - property:{SetLongline.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT}; + property:{SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT}; model:{bean.getLightsticksPerBasketCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.lightsticksPerBasketCount")}; @@ -289,7 +289,7 @@ } #basketsPerSectionCount { - property:{SetLongline.PROPERTY_BASKETS_PER_SECTION_COUNT}; + property:{SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT}; model:{bean.getBasketsPerSectionCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.basketsPerSectionCount")}; @@ -301,7 +301,7 @@ } #totalBasketsCount { - property:{SetLongline.PROPERTY_TOTAL_BASKETS_COUNT}; + property:{SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT}; model:{bean.getTotalBasketsCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.totalBasketsCount")}; @@ -313,7 +313,7 @@ } #branchlinesPerBasketCount { - property:{SetLongline.PROPERTY_BRANCHLINES_PER_BASKET_COUNT}; + property:{SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT}; model:{bean.getBranchlinesPerBasketCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.branchlinesPerBasketCount")}; @@ -325,7 +325,7 @@ } #totalSectionsCount { - property:{SetLongline.PROPERTY_TOTAL_SECTIONS_COUNT}; + property:{SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT}; model:{bean.getTotalSectionsCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.totalSectionsCount")}; @@ -337,7 +337,7 @@ } #totalHooksCount { - property:{SetLongline.PROPERTY_TOTAL_HOOKS_COUNT}; + property:{SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT}; model:{bean.getTotalHooksCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.totalHooksCount")}; @@ -359,45 +359,45 @@ #haulingDirectionSameAsSetting { booleanValue:{bean.getHaulingDirectionSameAsSetting()}; - _propertyName: {SetLongline.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING}; + _propertyName: {SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING}; _validatorLabel:{t("observe.setLongline.haulingDirectionSameAsSetting")}; } #haulingStartTimeStamp { label:{t("observe.setLongline.haulingStartTimeStamp")}; date:{bean.getHaulingStartTimeStamp()}; - propertyDate: {SetLongline.PROPERTY_HAULING_START_TIME_STAMP}; - propertyDayDate: {SetLongline.PROPERTY_HAULING_START_DATE}; - propertyTimeDate: {SetLongline.PROPERTY_HAULING_START_TIME}; + propertyDate: {SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP}; + //propertyDayDate: {SetLonglineDto.PROPERTY_HAULING_START_DATE}; + //propertyTimeDate: {SetLonglineDto.PROPERTY_HAULING_START_TIME}; _validatorLabel:{t("observe.setLongline.haulingStartTimeStamp")}; } #haulingStartCoordinates { - propertyLatitude:{SetLongline.PROPERTY_HAULING_START_LATITUDE}; - propertyLongitude:{SetLongline.PROPERTY_HAULING_START_LONGITUDE}; - /*propertyQuadrant:{SetLongline.PROPERTY_HAULING_START_QUADRANT};*/ + propertyLatitude:{SetLonglineDto.PROPERTY_HAULING_START_LATITUDE}; + propertyLongitude:{SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE}; + /*propertyQuadrant:{SetLonglineDto.PROPERTY_HAULING_START_QUADRANT};*/ latitude:{bean.getHaulingStartLatitude()}; longitude:{bean.getHaulingStartLongitude()}; - quadrant:{bean.getHaulingStartQuadrant()}; + //quadrant:{bean.getHaulingStartQuadrant()}; _validatorLabel:{t("observe.setLongline.haulingStartCoordinates")}; } #haulingEndTimeStamp { label:{t("observe.setLongline.haulingEndTimeStamp")}; date:{bean.getHaulingEndTimeStamp()}; - propertyDate: {SetLongline.PROPERTY_HAULING_END_TIME_STAMP}; - propertyDayDate: {SetLongline.PROPERTY_HAULING_END_DATE}; - propertyTimeDate: {SetLongline.PROPERTY_HAULING_END_TIME}; + propertyDate: {SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP}; + //propertyDayDate: {SetLonglineDto.PROPERTY_HAULING_END_DATE}; + //propertyTimeDate: {SetLonglineDto.PROPERTY_HAULING_END_TIME}; _validatorLabel:{t("observe.setLongline.haulingEndTimeStamp")}; } #haulingEndCoordinates { - propertyLatitude:{SetLongline.PROPERTY_HAULING_END_LATITUDE}; - propertyLongitude:{SetLongline.PROPERTY_HAULING_END_LONGITUDE}; - /*propertyQuadrant:{SetLongline.PROPERTY_HAULING_END_QUADRANT};*/ + propertyLatitude:{SetLonglineDto.PROPERTY_HAULING_END_LATITUDE}; + propertyLongitude:{SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE}; + /*propertyQuadrant:{SetLonglineDto.PROPERTY_HAULING_END_QUADRANT};*/ latitude:{bean.getHaulingEndLatitude()}; longitude:{bean.getHaulingEndLongitude()}; - quadrant:{bean.getHaulingEndQuadrant()}; + //quadrant:{bean.getHaulingEndQuadrant()}; _validatorLabel:{t("observe.setLongline.haulingEndCoordinates")}; } @@ -407,7 +407,7 @@ } #haulingBreaks { - property:{SetLongline.PROPERTY_HAULING_BREAKS}; + property:{SetLonglineDto.PROPERTY_HAULING_BREAKS}; model:{bean.getHaulingBreaks()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.haulingBreaks")}; 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 99d5aa9..3a9ce2f 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 @@ -69,21 +69,22 @@ beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> + <!--FIXME--> <field name='settingStartLongitude' component='settingStartCoordinates'/> <field name='settingStartLatitude' component='settingStartCoordinates'/> - <field name='settingStartQuadrant' component='settingStartCoordinates'/> + <!--<field name='settingStartQuadrant' component='settingStartCoordinates'/>--> <field name='settingEndLongitude' component='settingEndCoordinates'/> <field name='settingEndLatitude' component='settingEndCoordinates'/> - <field name='settingEndQuadrant' component='settingEndCoordinates'/> + <!--<field name='settingEndQuadrant' component='settingEndCoordinates'/>--> <field name='haulingStartLongitude' component='haulingStartCoordinates'/> <field name='haulingStartLatitude' component='haulingStartCoordinates'/> - <field name='haulingStartQuadrant' component='haulingStartCoordinates'/> + <!--<field name='haulingStartQuadrant' component='haulingStartCoordinates'/>--> <field name='haulingEndLongitude' component='haulingEndCoordinates'/> <field name='haulingEndLatitude' component='haulingEndCoordinates'/> - <field name='haulingEndQuadrant' component='haulingEndCoordinates'/> + <!--<field name='haulingEndQuadrant' component='haulingEndCoordinates'/>--> </BeanValidator> 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 0a95fb0..b67e6a7 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 @@ -341,12 +341,12 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { SetLonglineUI.BINDING_SETTING_START_TIME_STAMP_DATE, SetLonglineUI.BINDING_SETTING_START_COORDINATES_LATITUDE, SetLonglineUI.BINDING_SETTING_START_COORDINATES_LONGITUDE, - SetLonglineUI.BINDING_SETTING_START_COORDINATES_QUADRANT, +// SetLonglineUI.BINDING_SETTING_START_COORDINATES_QUADRANT, SetLonglineUI.BINDING_SETTING_END_TIME_STAMP_DATE, SetLonglineUI.BINDING_SETTING_END_COORDINATES_LATITUDE, SetLonglineUI.BINDING_SETTING_END_COORDINATES_LONGITUDE, - SetLonglineUI.BINDING_SETTING_END_COORDINATES_QUADRANT, +// SetLonglineUI.BINDING_SETTING_END_COORDINATES_QUADRANT, // setting caracteristics tab SetLonglineUI.BINDING_SETTING_VESSEL_SPEED_MODEL, @@ -376,12 +376,12 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { SetLonglineUI.BINDING_HAULING_START_TIME_STAMP_DATE, SetLonglineUI.BINDING_HAULING_START_COORDINATES_LATITUDE, SetLonglineUI.BINDING_HAULING_START_COORDINATES_LONGITUDE, - SetLonglineUI.BINDING_HAULING_START_COORDINATES_QUADRANT, +// SetLonglineUI.BINDING_HAULING_START_COORDINATES_QUADRANT, SetLonglineUI.BINDING_HAULING_END_TIME_STAMP_DATE, SetLonglineUI.BINDING_HAULING_END_COORDINATES_LATITUDE, SetLonglineUI.BINDING_HAULING_END_COORDINATES_LONGITUDE, - SetLonglineUI.BINDING_HAULING_END_COORDINATES_QUADRANT, +// SetLonglineUI.BINDING_HAULING_END_COORDINATES_QUADRANT, SetLonglineUI.BINDING_HAULING_BREAKS_MODEL); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css index a3a2d87..19dcf6f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css @@ -34,8 +34,10 @@ #observedSystem { bean:{bean}; - property: {ActivitySeine.PROPERTY_OBSERVED_SYSTEM}; - selected:{bean.getObservedSystem()}; + //FIXME + //property: {ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM}; + //FIXME + //selected:{bean.getObservedSystem()}; _validatorLabel: {t("observe.common.observedSystem")}; showListLabel: true; universeLabel:{t("observe.activityObservedSystem.availableObservedSystem")}; @@ -49,7 +51,7 @@ #observedSystemDistance { bean:{bean}; - property: {ActivitySeine.PROPERTY_OBSERVED_SYSTEM_DISTANCE}; + property: {ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE}; model:{bean.getObservedSystemDistance()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; 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 04f4596..249e37c 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,10 +20,10 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='ActivitySeineDto' contentTitle='{n("observe.activitySeineObservedSystem.title")}'> +<fr.ird.observe.ui.content.ContentUI superGenericType='ActivitySeineObservedSystemDto' contentTitle='{n("observe.activitySeineObservedSystem.title")}'> <import> - fr.ird.observe.services.dto.seine.ActivitySeineDto + fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto fr.ird.observe.services.dto.referential.seine.ObservedSystemDto fr.ird.observe.ui.actions.shared.ResetEditUIAction fr.ird.observe.ui.actions.shared.SaveEditUIAction @@ -50,15 +50,16 @@ <ActivitySeineObservedSystemUIModel id='model'/> <!-- edit bean --> - <ActivitySeineDto id='bean'/> + <ActivitySeineObservedSystemDto id='bean'/> <!-- validator --> <BeanValidator id='validator' - beanClass='fr.ird.observe.services.dto.seine.ActivitySeineDto' + beanClass='fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto' errorTableModel='{getErrorTableModel()}' context='n1-update-observedSystem'> - <field name='observedSystem' component='observedSystemPane'/> - <field name='observedSystemDistance'/> + <!--FIXME--> + <!--<field name='observedSystem' component='observedSystemPane'/>--> + <!--<field name='observedSystemDistance'/>--> <field name='comment'/> </BeanValidator> 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 f66e1da..fa39ae2 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 @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import org.apache.commons.logging.Log; @@ -36,7 +36,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<ActivitySeineDto> { +public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<ActivitySeineObservedSystemDto> { /** Logger */ static private Log log = LogFactory.getLog(ActivitySeineObservedSystemUIHandler.class); @@ -58,7 +58,7 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ @Override protected ContentMode getContentMode(DataContext dataContext) { - if (dataContext.isSelectedOpen(ActivitySeineDto.class)) { + if (dataContext.isSelectedOpen(ActivitySeineObservedSystemDto.class)) { // l'activity courante est ouverte, on peut modifier return ContentMode.UPDATE; 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 8309f5e..a14ad1e 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.business.BinderService; -import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -33,25 +33,24 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivitySeineDto> { +public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivitySeineObservedSystemDto> { private static final long serialVersionUID = 1L; public ActivitySeineObservedSystemUIModel() { - super(ActivitySeineDto.class); + super(ActivitySeineObservedSystemDto.class); } @Override - protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder = binderService.newBinderBuilder( - ActivitySeineDto.class, + BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> builder = binderService.newBinderBuilder( + ActivitySeineObservedSystemDto.class, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, //FIXME -// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM, -// ActivitySeineDto.PROPERTY_SET_SEINE, - ActivitySeineDto.PROPERTY_COMMENT - //FIXME -// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE +// ActivitySeineObservedSystemDto.PROPERTY_SET_SEINE, + ActivitySeineObservedSystemDto.PROPERTY_COMMENT, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE ); return builder; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css index eb9d468..d45c93f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css @@ -31,9 +31,10 @@ labelFor:{typeOperation}; } -#typeOperation { - selectedItem:{bean.getTypeTransmittingBuoyOperation()}; -} + //FIXME +//#typeOperation { +// selectedItem:{bean.getTypeTransmittingBuoyOperation()}; +//} #transmittingBuoys { visible:{typeOperation.getSelectedItem() != null}; @@ -59,11 +60,13 @@ } #transmittingBuoyOperation1 { - property:{TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + //FIXME + //property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; bean:{transmittingBuoy1}; enabled:false; showReset:true; - selectedItem:{transmittingBuoy1.getTransmittingBuoyOperation()}; + //FIXME + //selectedItem:{transmittingBuoy1.getTransmittingBuoyOperation()}; } #transmittingBuoyType1Label { @@ -72,7 +75,7 @@ } #transmittingBuoyType1 { - property:{TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_TYPE}; + property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE}; bean:{transmittingBuoy1}; showReset:true; selectedItem:{transmittingBuoy1.getTransmittingBuoyType()}; @@ -85,7 +88,8 @@ #ownership1 { selectedItem:{transmittingBuoy1.getOwnership()}; - enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} + //FIXME + //enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} } #country1Label { @@ -94,10 +98,10 @@ } #country1 { - property:{TransmittingBuoy.PROPERTY_COUNTRY}; + //property:{TransmittingBuoyDto.PROPERTY_COUNTRY}; bean:{transmittingBuoy1}; showReset:true; - selectedItem:{transmittingBuoy1.getCountry()}; + //selectedItem:{transmittingBuoy1.getCountry()}; } #code1Label { @@ -124,11 +128,13 @@ } #transmittingBuoyOperation2 { - property:{TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + //FIXME + //property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; bean:{transmittingBuoy2}; showReset:true; enabled:false; - selectedItem:{transmittingBuoy2.getTransmittingBuoyOperation()}; + //FIXME + //selectedItem:{transmittingBuoy2.getTransmittingBuoyOperation()}; } #transmittingBuoyType2Label { @@ -137,7 +143,7 @@ } #transmittingBuoyType2 { - property:{TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_TYPE}; + property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE}; bean:{transmittingBuoy2}; showReset:true; selectedItem:{transmittingBuoy2.getTransmittingBuoyType()}; @@ -150,7 +156,8 @@ #ownership2 { selectedItem:{transmittingBuoy2.getOwnership()}; - enabled: {!getHandler().isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} + //FIXME + //enabled: {!getHandler().isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} } #country2Label { @@ -159,10 +166,10 @@ } #country2 { - property:{TransmittingBuoy.PROPERTY_COUNTRY}; + //property:{TransmittingBuoyDto.PROPERTY_COUNTRY}; bean:{transmittingBuoy2}; showReset:true; - selectedItem:{transmittingBuoy2.getCountry()}; + //selectedItem:{transmittingBuoy2.getCountry()}; } #code2Label { 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 0ab8489..3d1b063 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 @@ -26,9 +26,8 @@ <import> 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.constants.seine.Ownership + fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation fr.ird.observe.services.dto.referential.CountryDto fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto @@ -75,7 +74,8 @@ <field name="transmittingBuoyOperation" component="transmittingBuoyOperation1"/> <field name="ownership" component="ownership1"/> <field name="code" component="code1"/> - <field name="country" component="country1"/> + <!--FIXME--> + <!--<field name="country" component="country1"/>--> </BeanValidator> <BeanValidator id='validatorBalise2' @@ -87,7 +87,8 @@ <field name="transmittingBuoyOperation" component="transmittingBuoyOperation2"/> <field name="ownership" component="ownership2"/> <field name="code" component="code2"/> - <field name="country" component="country2"/> + <!--FIXME--> + <!--<field name="country" component="country2"/>--> </BeanValidator> @@ -102,7 +103,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <EnumEditor id='typeOperation' - genericType='TypeTransmittingBuoyOperationDto' + genericType='TypeTransmittingBuoyOperation' constructorParams='TypeTransmittingBuoyOperation.class' onItemStateChanged='if(event.getStateChange()==ItemEvent.SELECTED && model.isEditing()) { getHandler().changeTypeOperation(typeOperation.getSelectedItem(), true); model.setModified(true); }'/> </cell> @@ -217,7 +218,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <EnumEditor id='ownership2' - constructorParams='OwnershipDto.class' + constructorParams='Ownership.class' onItemStateChanged='transmittingBuoy2.setOwnership((Ownership) ownership2.getSelectedItem())'/> </cell> </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 e030d08..2e250d9 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 @@ -104,7 +104,8 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH FloatingObjectDto bean = getBean(); - bean.clearTransmittingBuoy(); + //FIXME +// bean.clearTransmittingBuoy(); //FIXME: What should I do now ? bean.clearOperation(); // pour etre sur que rien ne va changer pendant le chargement de l'objet. @@ -114,8 +115,9 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH //FIXME // getDataService().loadEditEntity(getDataSource(), dcpId, getLoadExecutor()); - getUi().processDataBinding( - FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM); + //FIXME +// getUi().processDataBinding( +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM); TypeTransmittingBuoyOperation typeOperation = getUi().getTypeOperation().getSelectedItem(); @@ -181,8 +183,9 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH @Override public void startEditUI(String... binding) { super.startEditUI( - FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION1_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION2_SELECTED_ITEM, + //FIXME +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION1_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_CODE1_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_CODE2_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_OWNERSHIP1_SELECTED_ITEM, @@ -190,36 +193,41 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND1_TEXT, - FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND2_TEXT, - FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM); + FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND2_TEXT + //FIXME +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM + ); FloatingObjectTransmittingBuoyOperationUI ui = getUi(); addInfoMessage(t("observe.message.updating.floatingObject")); - List<TransmittingBuoyDto> balises = getBean().getTransmittingBuoy(); - if (balises != null && !balises.isEmpty()) { - TransmittingBuoyDto transmittingBuoy1 = ui.getTransmittingBuoy1(); - ui.getValidatorBalise1().setBean(transmittingBuoy1); - - if (balises.size() == 2) { - TransmittingBuoyDto transmittingBuoy2 = ui.getTransmittingBuoy2(); - ui.getValidatorBalise2().setBean(transmittingBuoy2); - } - } + //FIXME +// List<TransmittingBuoyDto> balises = getBean().getTransmittingBuoy(); +// if (balises != null && !balises.isEmpty()) { +// TransmittingBuoyDto transmittingBuoy1 = ui.getTransmittingBuoy1(); +// ui.getValidatorBalise1().setBean(transmittingBuoy1); +// +// if (balises.size() == 2) { +// TransmittingBuoyDto transmittingBuoy2 = ui.getTransmittingBuoy2(); +// ui.getValidatorBalise2().setBean(transmittingBuoy2); +// } +// } UIHelper.processDataBinding( ui, - FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION1_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION2_SELECTED_ITEM, + //FIXME +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION1_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_CODE1_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_CODE2_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_OWNERSHIP1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_OWNERSHIP2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND1_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND2_TEXT, - FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, + //FIXME +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE2_SELECTED_ITEM); getModel().setModified(false); @@ -392,7 +400,8 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH if (transmittingBuoy == null) { - editBean.setTransmittingBuoyOperation(transmittingBuoyOperation); + //FIXME +// editBean.setTransmittingBuoyOperation(transmittingBuoyOperation); if (log.isDebugEnabled()) { log.debug("Reuse an empty balise lue for objectOperation " + diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css index 0f00e65..0cc0294 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css @@ -38,7 +38,7 @@ BeanComboBox { } #objectOperation { - property:{FloatingObject.PROPERTY_OBJECT_OPERATION}; + property:{FloatingObjectDto.PROPERTY_OBJECT_OPERATION}; selectedItem:{bean.getObjectOperation()}; } @@ -48,7 +48,7 @@ BeanComboBox { } #objectType { - property:{FloatingObject.PROPERTY_OBJECT_TYPE}; + property:{FloatingObjectDto.PROPERTY_OBJECT_TYPE}; selectedItem:{bean.getObjectType()}; } @@ -58,7 +58,7 @@ BeanComboBox { } #objectFate { - property:{FloatingObject.PROPERTY_OBJECT_FATE}; + property:{FloatingObjectDto.PROPERTY_OBJECT_FATE}; selectedItem:{bean.getObjectFate()}; } @@ -69,7 +69,7 @@ BeanComboBox { #daysAtSeaCount { bean:{bean}; - property:{FloatingObject.PROPERTY_DAYS_AT_SEA_COUNT}; + property:{FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT}; model:{bean.getDaysAtSeaCount()}; autoPopup:{config.isAutoPopupNumberEditor()}; showPopupButton:{config.isShowNumberEditorButton()}; @@ -83,14 +83,14 @@ BeanComboBox { } #supportVesselName { - _propertyName:{FloatingObject.PROPERTY_SUPPORT_VESSEL_NAME}; + _propertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; text:{getStringValue(bean.getSupportVesselName())}; _validatorLabel:{"observe.common.supportVesselName"}; } #resetSupportVesselName{ toolTipText:"observe.action.reset.supportVesselName.tip"; - _resetPropertyName:{FloatingObject.PROPERTY_SUPPORT_VESSEL_NAME}; + _resetPropertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; } #comment { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css index 7e4d4ee..2cb0a0a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css @@ -38,7 +38,7 @@ } #startTime { - propertyDate:{SetSeine.PROPERTY_START_TIME}; + propertyDate:{SetSeineDto.PROPERTY_START_TIME}; label:{t("observe.setSeine.startTime")}; date:{bean.getStartTime()}; dateEditable:false; @@ -46,18 +46,18 @@ } #endPursingTimeStamp { - propertyDate: {SetSeine.PROPERTY_END_PURSING_TIME_STAMP}; - propertyDayDate: {SetSeine.PROPERTY_END_PURSING_DATE}; - propertyTimeDate: {SetSeine.PROPERTY_END_PURSING_TIME}; + propertyDate: {SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP}; + propertyDayDate: {SetSeineDto.PROPERTY_END_PURSING_DATE}; + propertyTimeDate: {SetSeineDto.PROPERTY_END_PURSING_TIME}; label:{t("observe.setSeine.endPursingTimeStamp")}; date:{bean.getEndPursingTimeStamp()}; _validatorLabel:{t("observe.setSeine.endPursingTimeStamp")}; } #endSetTimeStamp { - propertyDate: {SetSeine.PROPERTY_END_SET_TIME_STAMP}; - propertyDayDate: {SetSeine.PROPERTY_END_SET_DATE}; - propertyTimeDate: {SetSeine.PROPERTY_END_SET_TIME}; + propertyDate: {SetSeineDto.PROPERTY_END_SET_TIME_STAMP}; + propertyDayDate: {SetSeineDto.PROPERTY_END_SET_DATE}; + propertyTimeDate: {SetSeineDto.PROPERTY_END_SET_TIME}; label:{t("observe.setSeine.endSetTimeStamp")}; date:{bean.getEndSetTimeStamp()}; _validatorLabel:{t("observe.setSeine.endSetTimeStamp")}; @@ -69,7 +69,7 @@ } #reasonForNullSet { - property:{SetSeine.PROPERTY_REASON_FOR_NULL_SET}; + property:{SetSeineDto.PROPERTY_REASON_FOR_NULL_SET}; selectedItem:{bean.getReasonForNullSet()}; _validatorLabel:{t("observe.setSeine.reasonForNullSet")}; } @@ -80,14 +80,14 @@ } #supportVesselName { - _propertyName:{SetSeine.PROPERTY_SUPPORT_VESSEL_NAME}; + _propertyName:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME}; text:{getStringValue(bean.getSupportVesselName())}; _validatorLabel:{t("observe.setSeine.supportVesselName")}; } #resetSupportVesselName{ toolTipText:"observe.action.reset.supportVesselName.tip"; - _resetPropertyName:{SetSeine.PROPERTY_SUPPORT_VESSEL_NAME}; + _resetPropertyName:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME}; } #targetDiscardedLabel { @@ -96,7 +96,7 @@ } #targetDiscarded { - _propertyName:{SetSeine.PROPERTY_TARGET_DISCARDED}; + _propertyName:{SetSeineDto.PROPERTY_TARGET_DISCARDED}; booleanValue:{bean.getTargetDiscarded()}; _validatorLabel:{t("observe.setSeine.targetDiscarded")}; } @@ -107,7 +107,7 @@ } #nonTargetDiscarded { - _propertyName:{SetSeine.PROPERTY_NON_TARGET_DISCARDED}; + _propertyName:{SetSeineDto.PROPERTY_NON_TARGET_DISCARDED}; booleanValue:{bean.getNonTargetDiscarded()}; _validatorLabel:{t("observe.setSeine.nonTargetDiscarded")}; } @@ -135,7 +135,7 @@ } #schoolThickness { - property:{SetSeine.PROPERTY_SCHOOL_THICKNESS}; + property:{SetSeineDto.PROPERTY_SCHOOL_THICKNESS}; model:{bean.getSchoolThickness()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.schoolThickness")}; @@ -147,7 +147,7 @@ } #schoolMeanDepth { - property:{SetSeine.PROPERTY_SCHOOL_MEAN_DEPTH}; + property:{SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH}; model:{bean.getSchoolMeanDepth()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.schoolMeanDepth")}; @@ -159,7 +159,7 @@ } #schoolTopDepth { - property:{SetSeine.PROPERTY_SCHOOL_TOP_DEPTH}; + property:{SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH}; model:{bean.getSchoolTopDepth()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.schoolTopDepth")}; @@ -171,7 +171,7 @@ } #currentMeasureDepth { - property:{SetSeine.PROPERTY_CURRENT_MEASURE_DEPTH}; + property:{SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH}; model:{bean.getCurrentMeasureDepth()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.currentMeasureDepth")}; @@ -183,7 +183,7 @@ } #currentSpeed { - property:{SetSeine.PROPERTY_CURRENT_SPEED}; + property:{SetSeineDto.PROPERTY_CURRENT_SPEED}; model:{bean.getCurrentSpeed()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL1_PATTERN}; @@ -196,7 +196,7 @@ } #currentDirection { - property:{SetSeine.PROPERTY_CURRENT_DIRECTION}; + property:{SetSeineDto.PROPERTY_CURRENT_DIRECTION}; model:{bean.getCurrentDirection()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_3_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.currentDirection")}; @@ -208,14 +208,14 @@ } #maxGearDepth { - property:{SetSeine.PROPERTY_MAX_GEAR_DEPTH}; + property:{SetSeineDto.PROPERTY_MAX_GEAR_DEPTH}; model:{bean.getMaxGearDepth()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.maxGearDepth")}; } #sonarUsed { - _propertyName:{SetSeine.PROPERTY_SONAR_USED}; + _propertyName:{SetSeineDto.PROPERTY_SONAR_USED}; text:"observe.setSeine.sonarUsed"; selected:{bean.isSonarUsed()}; _validatorLabel:{t("observe.setSeine.sonarUsed")}; 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 f30eb5f..78df990 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 @@ -92,7 +92,7 @@ <JLabel id='reasonForNullSetLabel'/> </cell> <cell anchor='east' fill='both'> - <BeanComboBox id='reasonForNullSet' genericType='ReasonForNullSet' constructorParams='this'/> + <BeanComboBox id='reasonForNullSet' genericType='ReasonForNullSetDto' constructorParams='this'/> </cell> </row> <row> 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 e999bfd..df0aff6 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 @@ -21,15 +21,11 @@ */ package fr.ird.observe.ui.content.impl.seine; -import fr.ird.observe.DataService; -import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.business.util.TopiaExecutor2; import fr.ird.observe.services.dto.constants.seine.SchoolType; -import fr.ird.observe.services.dto.constants.seine.SchoolTypeDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -45,10 +41,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; 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 2417ea9..6d78cdd 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 AbstractObserveDto, C extends AbstractObserveDto'> + genericType='E extends IdDto, C extends IdDto'> <import> fr.ird.observe.ui.actions.shared.ReOpenUIAction fr.ird.observe.ui.actions.shared.SelectNodeUIAction - fr.ird.observe.services.dto.AbstractObserveDto + fr.ird.observe.services.dto.IdDto jaxx.runtime.swing.editor.bean.BeanListHeader diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java index b568778..b5f7dfb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java @@ -24,6 +24,8 @@ package fr.ird.observe.ui.content.list; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -33,7 +35,6 @@ import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.editor.bean.BeanListHeader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.DefaultListCellRenderer; import javax.swing.Icon; @@ -52,7 +53,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.5 */ -public abstract class ContentListUIHandler<E extends TopiaEntity, C extends TopiaEntity> extends ContentUIHandler<E> { +public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> extends ContentUIHandler<E> { /** Logger */ static private Log log = LogFactory.getLog(ContentListUIHandler.class); @@ -135,7 +136,8 @@ public abstract class ContentListUIHandler<E extends TopiaEntity, C extends Topi model.setCanReopen(canReopen); E bean = getBean(); - getDataService().loadEditEntity(getDataSource(), selectedId, getLoadExecutor()); + //FIXME +// getDataService().loadEditEntity(getDataSource(), selectedId, getLoadExecutor()); List<C> data = getChilds(bean); @@ -171,7 +173,7 @@ public abstract class ContentListUIHandler<E extends TopiaEntity, C extends Topi if (selectedData != null) { // obtain the node corresponding to the selected data - String id = selectedData.getTopiaId(); + String id = selectedData.getId(); ObserveTreeHelper helper = getTreeHelper(getUi()); ObserveNode selectedNode = helper.getSelectedNode(); node = helper.findNode(selectedNode, id); @@ -241,18 +243,18 @@ public abstract class ContentListUIHandler<E extends TopiaEntity, C extends Topi ); if (value == null || - !(value instanceof TopiaEntity) || + !(value instanceof IdDto) || containerNode == null) { // rien de plus a faire return comp; } - TopiaEntity e = (TopiaEntity) value; + IdDto e = (IdDto) value; // recuperation du noeud correspondant dans l'arbre ObserveNode node = - treeHelper.findNode(containerNode, e.getTopiaId()); + treeHelper.findNode(containerNode, e.getId()); if (node == null) { 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 661d644..d3cb3c4 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 @@ -22,11 +22,12 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +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; @@ -42,7 +43,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLongline, ActivityLongline> { +public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglineDto, ActivityLonglineDto> { /** Logger */ static private Log log = LogFactory.getLog(ActivityLonglinesUIHandler.class); @@ -69,7 +70,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin boolean openActivity = dataContext.isOpenActivity(); - if (dataContext.isSelectedOpen(TripLongline.class)) { + if (dataContext.isSelectedOpen(TripLonglineDto.class)) { // // la marée courante est ouverte @@ -107,18 +108,20 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin } @Override - protected List<ActivityLongline> getChilds(TripLongline bean) throws DataSourceException { + protected List<ActivityLonglineDto> getChilds(TripLonglineDto bean) throws DataSourceException { DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<ActivityLongline> list = dataService.getActivityLonglineStubByTrip(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " activities."); - } - - return list; + //FIXME +// DataService dataService = getDataService(); +// +// List<ActivityLongline> list = dataService.getActivityLonglineStubByTrip(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " activities."); +// } +// +// return list; + return null; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css index 84d599b..517aed0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css @@ -27,7 +27,7 @@ .gotoOpenTrip { visible:{model.isUpdatingMode() && dataContext.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{TripLongline.class}; + _type:{TripLonglineDto.class}; _text:{t("observe.action.goto.open.maree")}; _toolTipText:{t("observe.action.goto.open.trip.tip")}; } @@ -35,7 +35,7 @@ .gotoOpenTrip2 { visible:{model.isReadingMode() && dataContext.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{TripLongline.class}; + _type:{TripLonglineDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.maree")}; _toolTipText:{t("observe.action.goto.open.other.maree.tip")}; @@ -44,7 +44,7 @@ .gotoOpenActivity { visible:{model.isUpdatingMode() && dataContext.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{ActivityLongline.class}; + _type:{ActivityLonglineDto.class}; _text:{t("observe.action.goto.open.activity")}; _toolTipText:{t("observe.action.goto.open.activity.tip")}; } @@ -52,7 +52,7 @@ .gotoOpenActivity2 { visible:{model.isReadingMode() && dataContext.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{ActivityLongline.class}; + _type:{ActivityLonglineDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.activity")}; _toolTipText:{t("observe.action.goto.open.other.activity.tip")}; 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 b0599d1..1d641fc 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 @@ -22,11 +22,12 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +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; @@ -42,7 +43,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class TripLonglinesUIHandler extends ContentListUIHandler<Program, TripLongline> { +public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, TripLonglineDto> { /** Logger */ static private final Log log = LogFactory.getLog(TripLonglinesUIHandler.class); @@ -68,7 +69,7 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<Program, TripLo // il existe un maree ouverte // - if (dataContext.isSelectedOpen(Program.class)) { + if (dataContext.isSelectedOpen(ProgramDto.class)) { // le programme courant a une maree ouverte addInfoMessage(n("observe.tripLongline.message.active.found")); @@ -90,19 +91,21 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<Program, TripLo } @Override - protected List<TripLongline> getChilds(Program bean) throws DataSourceException { + protected List<TripLonglineDto> getChilds(ProgramDto bean) throws DataSourceException { DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<TripLongline> list = dataService.getTripLonglineStubByProgram(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " trips."); - } - - return list; - + //FIXME +// DataService dataService = getDataService(); +// +// List<TripLongline> list = dataService.getTripLonglineStubByProgram(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " trips."); +// } +// +// return list; + + return null; } } 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 7616c14..8ad0360 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 @@ -21,11 +21,12 @@ */ package fr.ird.observe.ui.content.list.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +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; @@ -39,7 +40,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ActivitySeinesUIHandler extends ContentListUIHandler<Route, ActivitySeine> { +public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, ActivitySeineDto> { /** Logger */ static private Log log = LogFactory.getLog(ActivitySeinesUIHandler.class); @@ -67,7 +68,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<Route, Activit boolean openActivity = dataContext.isOpenActivity(); - if (dataContext.isSelectedOpen(Route.class)) { + if (dataContext.isSelectedOpen(RouteDto.class)) { // // la route courante est ouverte @@ -105,19 +106,20 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<Route, Activit } @Override - protected List<ActivitySeine> getChilds(Route bean) throws DataSourceException { + protected List<ActivitySeineDto> getChilds(RouteDto bean) throws DataSourceException { DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<ActivitySeine> list = dataService.getActivitySeineStubByRoute(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " activities."); - } - - return list; - + //FIXME +// DataService dataService = getDataService(); +// +// List<ActivitySeine> list = dataService.getActivitySeineStubByRoute(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " activities."); +// } +// +// return list; + return null; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css index 5a99934..8633b3b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css @@ -27,7 +27,7 @@ .gotoOpenTrip { visible:{model.isUpdatingMode() && dataContext.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{TripSeine.class}; + _type:{TripSeineDto.class}; _text:{t("observe.action.goto.open.maree")}; _toolTipText:{t("observe.action.goto.open.trip.tip")}; } @@ -35,7 +35,7 @@ .gotoOpenTrip2 { visible:{model.isReadingMode() && dataContext.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{TripSeine.class}; + _type:{TripSeineDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.maree")}; _toolTipText:{t("observe.action.goto.open.other.maree.tip")}; @@ -44,7 +44,7 @@ .gotoOpenRoute { visible:{model.isUpdatingMode() && dataContext.isOpenRoute()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{Route.class}; + _type:{RouteDto.class}; _text:{t("observe.action.goto.open.route")}; _toolTipText:{t("observe.action.goto.open.route.tip")}; } @@ -52,7 +52,7 @@ .gotoOpenRoute2 { visible:{model.isReadingMode() && dataContext.isOpenRoute()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{Route.class}; + _type:{RouteDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.route")}; _toolTipText:{t("observe.action.goto.open.other.route.tip")}; @@ -61,7 +61,7 @@ .gotoOpenActivity { visible:{model.isUpdatingMode() && dataContext.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{ActivitySeine.class}; + _type:{ActivitySeineDto.class}; _text:{t("observe.action.goto.open.activity")}; _toolTipText:{t("observe.action.goto.open.activity.tip")}; } @@ -69,7 +69,7 @@ .gotoOpenActivity2 { visible:{model.isReadingMode() && dataContext.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{ActivitySeine.class}; + _type:{ActivitySeineDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.activity")}; _toolTipText:{t("observe.action.goto.open.other.activity.tip")}; 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 5f1ff0b..5ecef54 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 @@ -21,11 +21,12 @@ */ package fr.ird.observe.ui.content.list.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +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; @@ -39,7 +40,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class RoutesUIHandler extends ContentListUIHandler<TripSeine, Route> { +public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto> { /** Logger */ static private Log log = LogFactory.getLog(RoutesUIHandler.class); @@ -68,7 +69,7 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeine, Route> { boolean openRoute = dataContext.isOpenRoute(); - if (dataContext.isSelectedOpen(TripSeine.class)) { + if (dataContext.isSelectedOpen(TripSeineDto.class)) { // la marée courante est ouverte @@ -102,18 +103,20 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeine, Route> { } @Override - protected List<Route> getChilds(TripSeine bean) throws DataSourceException { - - DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<Route> list = dataService.getRouteStubByTrip(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " routes."); - } - - return list; + protected List<RouteDto> getChilds(TripSeineDto bean) throws DataSourceException { + + //FIXME +// DataSource source = getDataSource(); +// DataService dataService = getDataService(); +// +// List<Route> list = dataService.getRouteStubByTrip(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " routes."); +// } +// +// return list; + return null; } } 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 fa75ef0..5d83840 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 @@ -21,11 +21,12 @@ */ package fr.ird.observe.ui.content.list.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +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; @@ -39,7 +40,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TripSeinesUIHandler extends ContentListUIHandler<Program, TripSeine> { +public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSeineDto> { /** Logger */ static private final Log log = LogFactory.getLog(TripSeinesUIHandler.class); @@ -65,7 +66,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<Program, TripSeine // il existe un maree ouverte // - if (dataContext.isSelectedOpen(Program.class)) { + if (dataContext.isSelectedOpen(ProgramDto.class)) { // le program courant a une maree ouverte addInfoMessage(n("observe.tripSeine.message.active.found")); @@ -87,18 +88,21 @@ public class TripSeinesUIHandler extends ContentListUIHandler<Program, TripSeine } @Override - protected List<TripSeine> getChilds(Program bean) throws DataSourceException { - - DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<TripSeine> list = dataService.getTripSeineStubByProgram(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " trips."); - } - - return list; + protected List<TripSeineDto> getChilds(ProgramDto bean) throws DataSourceException { + + //FIXME +// DataSource source = getDataSource(); +// DataService dataService = getDataService(); +// +// List<TripSeine> list = dataService.getTripSeineStubByProgram(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " trips."); +// } +// +// return list; + + return null; } } 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 caa3af1..12cbfa9 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,7 +23,7 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' - genericType='E extends AbstractObserveDto & OpenableDto' + genericType='E extends OpenableDto'

<import> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css index 40ec502..3bb8489 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css @@ -27,17 +27,20 @@ } #timeStamp { - propertyDate:{ActivityLongline.PROPERTY_TIME_STAMP}; - propertyDayDate:{ActivityLongline.PROPERTY_DATE}; - propertyTimeDate:{ActivityLongline.PROPERTY_TIME}; + propertyDate:{ActivityLonglineDto.PROPERTY_TIME_STAMP}; + //FIXME + //propertyDayDate:{ActivityLonglineDto.PROPERTY_DATE}; + //FIXME + //propertyTimeDate:{ActivityLonglineDto.PROPERTY_TIME}; label:{t("observe.activityLongline.timeStamp")}; date:{bean.getTimeStamp()}; } #coordinatesEditor { - propertyLatitude:{ActivityLongline.PROPERTY_LATITUDE}; - propertyLongitude:{ActivityLongline.PROPERTY_LONGITUDE}; - propertyQuadrant:{ActivityLongline.PROPERTY_QUADRANT}; + propertyLatitude:{ActivityLonglineDto.PROPERTY_LATITUDE}; + propertyLongitude:{ActivityLonglineDto.PROPERTY_LONGITUDE}; + //FIXME + //propertyQuadrant:{ActivityLonglineDto.PROPERTY_QUADRANT}; } #vesselActivityLonglineLabel { @@ -46,7 +49,7 @@ } #vesselActivityLongline { - property:{ActivityLongline.PROPERTY_VESSEL_ACTIVITY_LONGLINE}; + property:{ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE}; selectedItem:{bean.getVesselActivityLongline()}; enabled:{!model.isUpdatingMode()}; } @@ -57,7 +60,7 @@ } #fpaZone { - property:{ActivityLongline.PROPERTY_FPA_ZONE}; + property:{ActivityLonglineDto.PROPERTY_FPA_ZONE}; selectedItem:{bean.getFpaZone()}; } @@ -67,7 +70,7 @@ } #seaSurfaceTemperature { - property:{ActivityLongline.PROPERTY_SEA_SURFACE_TEMPERATURE}; + property:{ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE}; model:{bean.getSeaSurfaceTemperature()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; @@ -96,5 +99,5 @@ actionIcon:add; text:"observe.action.add.setLongline"; toolTipText:"observe.action.add.setLongline.tip"; - enabled:{model.isValid() && bean.isSetOperation() && bean.getSetLongline() == null}; + enabled:{model.isValid()}; // FIXME && bean.isSetOperation() && bean.getSetLongline() == null}; } 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 ecbd9a1..c74688f 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 @@ -65,7 +65,8 @@ <field name='longitude' component='coordinatesEditor'/> <field name='latitude' component='coordinatesEditor'/> - <field name='quadrant' component='coordinatesEditor'/> + <!--FIXME--> + <!--<field name='quadrant' component='coordinatesEditor'/>--> </BeanValidator> @@ -112,7 +113,7 @@ <JLabel id='seaSurfaceTemperatureLabel'/> </cell> <cell anchor='east' fill="both"> - <NumberEditor id='seaSurfaceTemperatureLabel' constructorParams='this'/> + <NumberEditor id='seaSurfaceTemperature' constructorParams='this'/> </cell> </row> @@ -138,7 +139,7 @@ <row> <cell weightx="0.5" fill="both"> <JButton id='addSet' - onActionPerformed='getHandler().addChild(SetLongline.class)'/> + onActionPerformed='getHandler().addChild(SetLonglineDto.class)'/> </cell> </row> </Table> 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 6e39265..4af6b58 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 @@ -185,9 +185,10 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity getUi().getCoordinatesEditor().setLatitudeAndLongitude(bean.getLatitude(), bean.getLongitude()); if (create) { - Integer quadrant = bean.getQuadrant(); + //FIXME +// Integer quadrant = bean.getQuadrant(); getUi().getCoordinatesEditor().setQuadrant(null); - getUi().getCoordinatesEditor().setQuadrant(quadrant); +// getUi().getCoordinatesEditor().setQuadrant(quadrant); } // on annule la modification engendree par ce binding diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css index 7282179..ec27bed 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css @@ -46,9 +46,10 @@ NumberEditor { } #observer { - property:{TripLongline.PROPERTY_OBSERVER}; + property:{TripLonglineDto.PROPERTY_OBSERVER}; selectedItem:{bean.getObserver()}; - _listPredicate:{Persons.newObserverPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newObserverPredicate()}; } #captainLabel { @@ -57,9 +58,10 @@ NumberEditor { } #captain { - property:{TripLongline.PROPERTY_CAPTAIN}; + property:{TripLonglineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - _listPredicate:{Persons.newCaptainPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newCaptainPredicate()}; } #dataEntryOperatorLabel { @@ -68,9 +70,10 @@ NumberEditor { } #dataEntryOperator { - property:{TripLongline.PROPERTY_DATA_ENTRY_OPERATOR}; + property:{TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - _listPredicate:{Persons.newDataEntryOperatorPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newDataEntryOperatorPredicate()}; } #tripTypeLabel{ @@ -79,7 +82,7 @@ NumberEditor { } #tripType { - property:{TripLongline.PROPERTY_TRIP_TYPE}; + property:{TripLonglineDto.PROPERTY_TRIP_TYPE}; selectedItem:{bean.getTripType()}; } @@ -89,9 +92,10 @@ NumberEditor { } #vessel { - property:{TripLongline.PROPERTY_VESSEL}; + property:{TripLonglineDto.PROPERTY_VESSEL}; selectedItem:{bean.getVessel()}; - _listPredicate:{Vessels.newVesselByVesselTypeIdPredicate(getConfig().getLonglineVesselTypeIds())}; + //FIXME + //_listPredicate:{VesselDtos.newVesselByVesselTypeIdPredicate(getConfig().getLonglineVesselTypeIds())}; } #oceanLabel{ @@ -100,9 +104,9 @@ NumberEditor { } #ocean { - property:{TripLongline.PROPERTY_OCEAN}; + property:{TripLonglineDto.PROPERTY_OCEAN}; selectedItem:{bean.getOcean()}; - enabled:{canEditOcean(bean.getActivityLongline())}; + //enabled:{canEditOcean(bean.getActivityLongline())}; } #departureHarbourLabel { @@ -111,7 +115,7 @@ NumberEditor { } #departureHarbour { - property:{TripLongline.PROPERTY_DEPARTURE_HARBOUR}; + property:{TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR}; selectedItem:{bean.getDepartureHarbour()}; } @@ -121,7 +125,7 @@ NumberEditor { } #landingHarbour { - property:{TripLongline.PROPERTY_LANDING_HARBOUR}; + property:{TripLonglineDto.PROPERTY_LANDING_HARBOUR}; selectedItem:{bean.getLandingHarbour()}; } @@ -131,7 +135,7 @@ NumberEditor { } #totalFishingOperationsNumber { - property:{TripLongline.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER}; + property:{TripLonglineDto.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER}; model:{bean.getTotalFishingOperationsNumber()}; useFloat:false; } @@ -143,12 +147,12 @@ NumberEditor { #resetHomeId { toolTipText:"observe.action.reset.homeId.tip"; - _resetPropertyName: {TripLongline.PROPERTY_HOME_ID}; + _resetPropertyName: {TripLonglineDto.PROPERTY_HOME_ID}; } #homeId { text:{getStringValue(bean.getHomeId())}; - _propertyName: {TripLongline.PROPERTY_HOME_ID}; + _propertyName: {TripLonglineDto.PROPERTY_HOME_ID}; } #startDateLabel { @@ -158,7 +162,7 @@ NumberEditor { #startDate { date:{bean.getStartDate()}; - _propertyName: {TripLongline.PROPERTY_START_DATE}; + _propertyName: {TripLonglineDto.PROPERTY_START_DATE}; } #endDateLabel { @@ -168,7 +172,7 @@ NumberEditor { #endDate { date:{bean.getEndDate()}; - _propertyName: {TripLongline.PROPERTY_END_DATE}; + _propertyName: {TripLonglineDto.PROPERTY_END_DATE}; } #comment { 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 c5f1ea5..988ca9d 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 @@ -30,9 +30,9 @@ 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.PersonDtos fr.ird.observe.services.dto.referential.VesselDto - fr.ird.observe.services.dto.referential.VesselDtosDto + fr.ird.observe.services.dto.referential.VesselDtos fr.ird.observe.services.dto.referential.PersonDto fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.services.dto.referential.longline.TripTypeDto @@ -68,7 +68,8 @@ errorTableModel='{getErrorTableModel()}' autoField='true' context='n1-update'> - <field name='activityLongline' component='{actionDown}'/> + <!--FIXME--> + <!--<field name='activityLongline' component='{actionDown}'/>--> </BeanValidator> <script><![CDATA[ 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 dcda386..fb08b00 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 @@ -118,7 +118,8 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline TripLonglineUI ui = getUi(); TripMapUI tripMap = ui.getTripMap(); - tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); + //FIXME +// tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); } }); buildTripMap = false; @@ -173,12 +174,12 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline //FIXME // dataService.loadEditEntity(source, tripId, getLoadExecutor()); - if (!bean.isActivityLonglineEmpty()) { + //FIXME +// if (!bean.isActivityLonglineEmpty()) { - // on force le trie des routes - //FIXME + // on force le trie des routes // ActivityLonglineDtos.sort(bean.getActivityLongline()); - } +// } } getUi().getTripLonglineTabPane().setSelectedIndex(0); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css index 681e622..e0b3214 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css @@ -27,7 +27,7 @@ } #time { - propertyTime:{ActivitySeine.PROPERTY_TIME}; + propertyTime:{ActivitySeineDto.PROPERTY_TIME}; bean:{bean}; label:{t("observe.common.heureobservation")}; time:{bean.getTime()}; @@ -40,9 +40,10 @@ } #coordinatesEditor { - propertyLatitude:{ActivitySeine.PROPERTY_LATITUDE}; - propertyLongitude:{ActivitySeine.PROPERTY_LONGITUDE}; - propertyQuadrant:{ActivitySeine.PROPERTY_QUADRANT}; + propertyLatitude:{ActivitySeineDto.PROPERTY_LATITUDE}; + propertyLongitude:{ActivitySeineDto.PROPERTY_LONGITUDE}; + //FIXME + //propertyQuadrant:{ActivitySeineDto.PROPERTY_QUADRANT}; } #generalTab { @@ -66,7 +67,7 @@ } #vesselActivitySeine { - property:{ActivitySeine.PROPERTY_VESSEL_ACTIVITY_SEINE}; + property:{ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE}; selectedItem:{bean.getVesselActivitySeine()}; enabled:{!model.isUpdatingMode()}; } @@ -77,7 +78,7 @@ } #surroundingActivity { - property:{ActivitySeine.PROPERTY_SURROUNDING_ACTIVITY}; + property:{ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY}; selectedItem:{bean.getSurroundingActivity()}; } @@ -87,9 +88,10 @@ } #previousFpaZone { - property:{ActivitySeine.PROPERTY_PREVIOUS_FPA_ZONE}; + property:{ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE}; selectedItem:{bean.getPreviousFpaZone()}; - enabled:{bean.isChangedZoneOperation()}; + //FIXME + //enabled:{bean.isChangedZoneOperation()}; } #currentFpaZoneLabel { @@ -98,9 +100,10 @@ } #currentFpaZone { - property:{ActivitySeine.PROPERTY_CURRENT_FPA_ZONE}; + property:{ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE}; selectedItem:{bean.getCurrentFpaZone()}; - enabled:{!bean.isChangedZoneOperation()}; + //FIXME + //enabled:{!bean.isChangedZoneOperation()}; } #nextFpaZoneLabel { @@ -109,9 +112,10 @@ } #nextFpaZone { - property:{ActivitySeine.PROPERTY_NEXT_FPA_ZONE}; + property:{ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE}; selectedItem:{bean.getNextFpaZone()}; - enabled:{bean.isChangedZoneOperation()}; + //FIXME + //enabled:{bean.isChangedZoneOperation()}; } #vesselSpeedLabel { @@ -120,7 +124,7 @@ } #vesselSpeed { - property:{ActivitySeine.PROPERTY_VESSEL_SPEED}; + property:{ActivitySeineDto.PROPERTY_VESSEL_SPEED}; model:{bean.getVesselSpeed()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; @@ -133,11 +137,11 @@ #resetErsId{ toolTipText:"observe.action.reset.ersId.tip"; - _resetPropertyName:{ActivitySeine.PROPERTY_ERS_ID}; + _resetPropertyName:{ActivitySeineDto.PROPERTY_ERS_ID}; } #ersId { - _propertyName:{ActivitySeine.PROPERTY_ERS_ID}; + _propertyName:{ActivitySeineDto.PROPERTY_ERS_ID}; text:{getStringValue(bean.getErsId())}; } @@ -147,7 +151,7 @@ } #seaSurfaceTemperature { - property:{ActivitySeine.PROPERTY_SEA_SURFACE_TEMPERATURE}; + property:{ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE}; model:{bean.getSeaSurfaceTemperature()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; @@ -159,7 +163,7 @@ } #wind { - property:{ActivitySeine.PROPERTY_WIND}; + property:{ActivitySeineDto.PROPERTY_WIND}; selectedItem:{bean.getWind()}; } @@ -169,7 +173,7 @@ } #detectionMode { - property:{ActivitySeine.PROPERTY_DETECTION_MODE}; + property:{ActivitySeineDto.PROPERTY_DETECTION_MODE}; selectedItem:{bean.getDetectionMode()}; } @@ -179,7 +183,7 @@ } #reasonForNoFishing { - property:{ActivitySeine.PROPERTY_REASON_FOR_NO_FISHING}; + property:{ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING}; selectedItem:{bean.getReasonForNoFishing()}; } @@ -212,7 +216,7 @@ } #addSet { - enabled:{model.isValid() && bean.isSetOperation() && bean.getSetSeine() == null}; + enabled:{model.isValid()};//FIXME && bean.isSetOperation() && bean.getSetSeine() == null}; text:"observe.action.add.set"; toolTipText:"observe.action.add.set.tip"; actionIcon:"add"; 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 58b3e55..88e96cd 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 @@ -70,12 +70,12 @@ errorTableModel='{getErrorTableModel()}' context='n1-create'> - <field name='observedSystem' component='{actionDown}'/> + <!--<field name='observedSystem' component='{actionDown}'/>--> <field name='longitude' component='coordinatesEditor'/> <field name='latitude' component='coordinatesEditor'/> - <field name='quadrant' component='coordinatesEditor'/> - <field name='floatingObject' component='addDCP'/> + <!--<field name='quadrant' component='coordinatesEditor'/>--> + <!--<field name='floatingObject' component='addDCP'/>--> </BeanValidator> 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 6a11a9e..60ff366 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 @@ -211,9 +211,10 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei getUi().getCoordinatesEditor().setLatitudeAndLongitude(bean.getLatitude(), bean.getLongitude()); if (create) { - Integer quadrant = bean.getQuadrant(); + //FIXME +// Integer quadrant = bean.getQuadrant(); getUi().getCoordinatesEditor().setQuadrant(null); - getUi().getCoordinatesEditor().setQuadrant(quadrant); +// getUi().getCoordinatesEditor().setQuadrant(quadrant); } // on annule la modification engendree par ce binding diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css index ccb9fd3..a7ef119 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css @@ -40,7 +40,7 @@ NumberEditor { #date { date:{bean.getDate()}; formats:{"dd/MM/yyyy"}; - _propertyName:{Route.PROPERTY_DATE}; + _propertyName:{RouteDto.PROPERTY_DATE}; } #startLogValueLabel { @@ -49,7 +49,7 @@ NumberEditor { } #startLogValue { - property:{Route.PROPERTY_START_LOG_VALUE}; + property:{RouteDto.PROPERTY_START_LOG_VALUE}; model:{bean.getStartLogValue()}; } @@ -59,7 +59,7 @@ NumberEditor { } #endLogValue { - property:{Route.PROPERTY_END_LOG_VALUE}; + property:{RouteDto.PROPERTY_END_LOG_VALUE}; model:{bean.getEndLogValue()}; enabled:{!model.isCreatingMode()}; } 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 f7cca18..3031ea9 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 @@ -50,7 +50,8 @@ beanClass='fr.ird.observe.services.dto.seine.RouteDto' errorTableModel='{getErrorTableModel()}' context='n1-update'> - <field name='activitySeine' component='{actionDown}'/> + <!--FIXME--> + <!--<field name='activitySeine' component='{actionDown}'/>--> </BeanValidator> <!-- formulaire --> 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 f320700..d121325 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 @@ -275,7 +275,8 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { repaintTripNode(); } - @Override + //FIXME +// @Override // protected Route onCreate(TopiaContext tx, Object parent, Route editBean) throws TopiaException { // // TripSeine parentBean = (TripSeine) parent; @@ -296,6 +297,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { boolean dateHasChanged; + //FIXME // @Override // protected Route onUpdate(TopiaContext tx, Object parent, Route beanToSave) throws TopiaException { // @@ -313,6 +315,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // return beanToSave; // } + //FIXME // @Override // protected boolean doDelete(Route bean, // DataService dataService, @@ -464,7 +467,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { VesselActivitySeineDto vesselActivitySeine = null; for (Object o : selectedUI.getVesselActivitySeine().getData()) { - VesselActivitySeineDto a = (VesselActivitySeine) o; + VesselActivitySeineDto a = (VesselActivitySeineDto) o; // if (ActivitySeineImpl.ACTIVITY_FIN_DE_VEILLE.equals(a.getCode())) { // vesselActivitySeine = a; // break; @@ -472,7 +475,8 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } // on la positionne sur le bean d'édition - selectedUI.getBean().setVesselActivitySeine(vesselActivitySeine); + // FIXME +// selectedUI.getBean().setVesselActivitySeine(vesselActivitySeine); if (close) { // on sauvegarde l'activity diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css index 7d1fa16..f6f99a1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css @@ -50,9 +50,10 @@ NumberEditor { } #observer { - property:{TripSeine.PROPERTY_OBSERVER}; + property:{TripSeineDto.PROPERTY_OBSERVER}; selectedItem:{bean.getObserver()}; - _listPredicate:{Persons.newObserverPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newObserverPredicate()}; } #captainLabel { @@ -61,9 +62,10 @@ NumberEditor { } #captain { - property:{TripSeine.PROPERTY_CAPTAIN}; + property:{TripSeineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - _listPredicate:{Persons.newCaptainPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newCaptainPredicate()}; } #dataEntryOperatorLabel { @@ -72,9 +74,10 @@ NumberEditor { } #dataEntryOperator { - property:{TripSeine.PROPERTY_DATA_ENTRY_OPERATOR}; + property:{TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - _listPredicate:{Persons.newDataEntryOperatorPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newDataEntryOperatorPredicate()}; } #vesselLabel { @@ -83,9 +86,10 @@ NumberEditor { } #vessel { - property:{TripSeine.PROPERTY_VESSEL}; + property:{TripSeineDto.PROPERTY_VESSEL}; selectedItem:{bean.getVessel()}; - _listPredicate:{Vessels.newVesselByVesselTypeIdPredicate(getConfig().getSeineVesselTypeIds())}; + //FIXME + //_listPredicate:{VesselDtos.newVesselByVesselTypeIdPredicate(getConfig().getSeineVesselTypeIds())}; } #oceanLabel { @@ -94,9 +98,10 @@ NumberEditor { } #ocean { - property:{TripSeine.PROPERTY_OCEAN}; + property:{TripSeineDto.PROPERTY_OCEAN}; selectedItem:{bean.getOcean()}; - enabled:{canEditOcean(bean.getRoute())}; + //FIXME + //enabled:{canEditOcean(bean.getRoute())}; } #departureHarbourLabel { @@ -105,7 +110,7 @@ NumberEditor { } #departureHarbour { - property:{TripSeine.PROPERTY_DEPARTURE_HARBOUR}; + property:{TripSeineDto.PROPERTY_DEPARTURE_HARBOUR}; selectedItem:{bean.getDepartureHarbour()}; } @@ -115,7 +120,7 @@ NumberEditor { } #landingHarbour { - property:{TripSeine.PROPERTY_LANDING_HARBOUR}; + property:{TripSeineDto.PROPERTY_LANDING_HARBOUR}; selectedItem:{bean.getLandingHarbour()}; } @@ -126,11 +131,11 @@ NumberEditor { #resetErsId{ toolTipText:"observe.action.reset.ersId.tip"; - _resetPropertyName:{TripSeine.PROPERTY_ERS_ID}; + _resetPropertyName:{TripSeineDto.PROPERTY_ERS_ID}; } #ersId { - _propertyName:{TripSeine.PROPERTY_ERS_ID}; + _propertyName:{TripSeineDto.PROPERTY_ERS_ID}; text:{getStringValue(bean.getErsId())}; } @@ -140,7 +145,7 @@ NumberEditor { } #startDate { - _propertyName:{TripSeine.PROPERTY_START_DATE}; + _propertyName:{TripSeineDto.PROPERTY_START_DATE}; date:{bean.getStartDate()}; } @@ -150,7 +155,7 @@ NumberEditor { } #endDate { - _propertyName:{TripSeine.PROPERTY_END_DATE}; + _propertyName:{TripSeineDto.PROPERTY_END_DATE}; date:{bean.getEndDate()}; } @@ -160,12 +165,12 @@ NumberEditor { } #resetFormsUrl { - _resetPropertyName:{TripSeine.PROPERTY_FORMS_URL}; + _resetPropertyName:{TripSeineDto.PROPERTY_FORMS_URL}; toolTipText:"observe.action.reset.formsUrl.tip"; } #formsUrl { - _propertyName:{TripSeine.PROPERTY_FORMS_URL}; + _propertyName:{TripSeineDto.PROPERTY_FORMS_URL}; text:{getStringValue(bean.getFormsUrl())}; } @@ -183,12 +188,12 @@ NumberEditor { } #resetReportsUrl { - _resetPropertyName:{TripSeine.PROPERTY_REPORTS_URL}; + _resetPropertyName:{TripSeineDto.PROPERTY_REPORTS_URL}; toolTipText:"observe.action.reset.reportsUrl.tip"; } #reportsUrl { - _propertyName:{TripSeine.PROPERTY_REPORTS_URL}; + _propertyName:{TripSeineDto.PROPERTY_REPORTS_URL}; text:{getStringValue(bean.getReportsUrl())}; } 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 8804f52..b7c7522 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 @@ -27,9 +27,9 @@ 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.PersonDtos fr.ird.observe.services.dto.referential.VesselDto - fr.ird.observe.services.dto.referential.VesselDtosDto + fr.ird.observe.services.dto.referential.VesselDtos fr.ird.observe.services.dto.referential.PersonDto fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.ui.util.tripMap.TripMapUI @@ -63,7 +63,8 @@ errorTableModel='{getErrorTableModel()}' autoField='true' context='n1-update'> - <field name='route' component='{actionDown}'/> + <!--FIXME--> + <!--<field name='route' component='{actionDown}'/>--> </BeanValidator> <script><![CDATA[ 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 09e0311..7c964ae 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 @@ -29,6 +29,7 @@ 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; +import fr.ird.observe.ui.util.tripMap.TripMapUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -116,7 +117,8 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { TripSeineUI ui = getUi(); TripMapUI tripMap = ui.getTripMap(); - tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); + //FIXME +// tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); } }); buildTripMap = false; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css index 0b70f35..8e94336 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css @@ -33,7 +33,7 @@ } #viewLayout { - /*useOnlyVisibleComponentDimensi/on:true;*/ + /*useOnlyVisibleComponentDimension:true;*/ selected:{getHandler().updateView(model.isEditing())}; } 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 20a1b10..6bf5ce3 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 ReferenceDto'> + genericType='E extends ReferentialDto'> <import> - fr.ird.observe.services.dto.ReferenceDto + fr.ird.observe.services.dto.referential.ReferentialDto 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 5f83a08..e3c78ff 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,48 +21,36 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveContext; +import fr.ird.observe.business.DecoratorService; +import fr.ird.observe.business.ObserveServiceHelper; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.business.validation.ValidationContext; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; 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.business.validation.ValidationContext; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.CardLayout2Ext; -import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.editor.bean.BeanListHeader; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.JToolBar; -import javax.swing.ListModel; -import javax.swing.RowSorter; -import javax.swing.SortOrder; -import javax.swing.SpringLayout; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Font; +import java.awt.*; import java.beans.Introspector; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -110,10 +98,10 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content super(ui, null, null); } - public static <E extends TopiaEntity> void showUsagesForDelete( + public static <E extends IdDto> void showUsagesForDelete( JAXXContext tx, E entity, - Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> usages) { + Map<Class<? extends IdDto>, List<? extends IdDto>> usages) { DecoratorService service = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); @@ -126,7 +114,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content String message2 = t("observe.message.show.usage.for.delete2"); UsagesUI usagesUI = new UsagesUI(tx); - usagesUI.init(message, message2, null, usages); + //FIXME + usagesUI.init(message, message2, null, null); UIHelper.askUser(null, t("observe.title.can.not.delete.referentiel"), @@ -137,10 +126,10 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content 0); } - public static <E extends TopiaEntity> boolean showUsagesForDesactivated( + public static <E extends IdDto> boolean showUsagesForDesactivated( JAXXContext tx, E entity, - Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> usages) { + Map<Class<? extends IdDto>, List<? extends IdDto>> usages) { DecoratorService service = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); @@ -151,7 +140,9 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content String message3 = t("observe.message.show.usage.for.desactivated3"); UsagesUI usagesUI = new UsagesUI(tx); - usagesUI.init(message, message2, message3, usages); + + //FIXME + usagesUI.init(message, message2, message3, null); int reponse = UIHelper.askUser(null, t("observe.title.need.confirm.to.desactivate.referentiel"), @@ -180,7 +171,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // copy right now the selected bean to the model bean to respect contract // of parent handler (for delation or save objectOperation...) - getLoadBinder().load(selectedBean, getBean(), true); + //FIXME +// getLoadBinder().load(selectedBean, getBean(), true); } @@ -217,16 +209,17 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content Class<E> beanType = getBeanType(); - try { - entities = getDataService().loadDecoratedEntities(getDataSource(), - beanType); - - } catch (DataSourceException e) { - ErrorDialogUI.showError(e); - return; - } - - List<Object[]> datas = new ArrayList<Object[]>(entities.size()); + //FIXME +// try { +// entities = getDataService().loadDecoratedEntities(getDataSource(), +// beanType); +// +// } catch (DataSourceException e) { +// ErrorDialogUI.showError(e); +// return; +// } +// +// List<Object[]> datas = new ArrayList<Object[]>(entities.size()); String[] naturalIds = getModel().getNaturalIds(); int nbColumns = naturalIds.length + 1; @@ -236,74 +229,75 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content columns[0] = Introspector.decapitalize(beanType.getSimpleName()); DecoratorService dService = getDecoratorService(); - Loador<E> binder = getLoadBinder(); - - Decorator<E> decorator = dService.getDecoratorByType(beanType); - for (E e : entities) { - Map<String, Object> values = binder.obtainProperties(e, naturalIds); - Object[] data = new Object[nbColumns]; - int index = 0; - data[0] = decorator.toString(e); - for (String property : naturalIds) { - Object o = values.get(property); - if (ContentReferenceUIModel.DEFAULT_PROPERTIES[0].equals(property) && o == null) { - // cas special du code à 0, le loador ne retourne pas - // de valeur car c'est la valeur par defaut d'un type - // primitif, on force donc l'utilisation du zero. - o = 0; - } - if ("code".equals(property) && o == null) { - // cas special du code à 0, le loador ne retourne pas - // de valeur car c'est la valeur par defaut d'un type - // primitif, on force donc l'utilisation du zero. - o = 0; - } - if ("gender".equals(property) && o == null) { - // cas special du code à 0, le loador ne retourne pas - // de valeur car c'est la valeur par defaut d'un type - // primitif, on force donc l'utilisation du zero. - o = 0; - } - Object value; - if (o instanceof ReferenceEntity) { - // on doit decoree la valeur - Decorator<?> d = dService.getDecoratorByType(o.getClass()); - value = d.toString(o); - } else { - value = o; - } - data[++index] = value; - } - datas.add(data); - } - - JTable table = new JTable(new UniqueKeyTableModel(columns, datas)); - - table.setAutoCreateRowSorter(true); - table.getRowSorter().setSortKeys(Arrays.asList( - new RowSorter.SortKey(0, SortOrder.ASCENDING))); - table.setFillsViewportHeight(true); - JScrollPane pane = new JScrollPane(); - - getUi().decorateUniqueKeyTable(table, new DefaultTableCellRenderer(), pane); - - pane.setViewportView(table); - pane.setVerticalScrollBarPolicy( - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); - - String title = t("observe.title.unique.key", - t(DecoratorService.getEntityLabel(beanType))); - - pane.setBorder(new TitledBorder(title)); - - JPopupMenu popup = new JPopupMenu(); - popup.setBorder(null); - popup.add(pane); - popup.pack(); - Dimension dim = popup.getPreferredSize(); - int x = (int) (button.getPreferredSize().getWidth() - dim.getWidth()); - int y = button.getHeight(); - popup.show(button, x, y); + //FIXME +// Loador<E> binder = getLoadBinder(); +// +// Decorator<E> decorator = dService.getDecoratorByType(beanType); +// for (E e : entities) { +// Map<String, Object> values = binder.obtainProperties(e, naturalIds); +// Object[] data = new Object[nbColumns]; +// int index = 0; +// data[0] = decorator.toString(e); +// for (String property : naturalIds) { +// Object o = values.get(property); +// if (ContentReferenceUIModel.DEFAULT_PROPERTIES[0].equals(property) && o == null) { +// // cas special du code à 0, le loador ne retourne pas +// // de valeur car c'est la valeur par defaut d'un type +// // primitif, on force donc l'utilisation du zero. +// o = 0; +// } +// if ("code".equals(property) && o == null) { +// // cas special du code à 0, le loador ne retourne pas +// // de valeur car c'est la valeur par defaut d'un type +// // primitif, on force donc l'utilisation du zero. +// o = 0; +// } +// if ("gender".equals(property) && o == null) { +// // cas special du code à 0, le loador ne retourne pas +// // de valeur car c'est la valeur par defaut d'un type +// // primitif, on force donc l'utilisation du zero. +// o = 0; +// } +// Object value; +// if (o instanceof ReferenceEntity) { +// // on doit decoree la valeur +// Decorator<?> d = dService.getDecoratorByType(o.getClass()); +// value = d.toString(o); +// } else { +// value = o; +// } +// data[++index] = value; +// } +// datas.add(data); +// } +// +// JTable table = new JTable(new UniqueKeyTableModel(columns, datas)); +// +// table.setAutoCreateRowSorter(true); +// table.getRowSorter().setSortKeys(Arrays.asList( +// new RowSorter.SortKey(0, SortOrder.ASCENDING))); +// table.setFillsViewportHeight(true); +// JScrollPane pane = new JScrollPane(); +// +// getUi().decorateUniqueKeyTable(table, new DefaultTableCellRenderer(), pane); +// +// pane.setViewportView(table); +// pane.setVerticalScrollBarPolicy( +// JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); +// +// String title = t("observe.title.unique.key", +// t(DecoratorService.getEntityLabel(beanType))); +// +// pane.setBorder(new TitledBorder(title)); +// +// JPopupMenu popup = new JPopupMenu(); +// popup.setBorder(null); +// popup.add(pane); +// popup.pack(); +// Dimension dim = popup.getPreferredSize(); +// int x = (int) (button.getPreferredSize().getWidth() - dim.getWidth()); +// int y = button.getHeight(); +// popup.show(button, x, y); } public void showUsages() { @@ -317,16 +311,17 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } // recherche des utilisation du bean dans la base - EntityMap usages; - try { - usages = getDataService().findAllUsages(getDataSource(), bean); - } catch (DataSourceException e) { - ErrorDialogUI.showError(e); - if (log.isErrorEnabled()) { - log.error(e); - } - return; - } + //FIXME +// EntityMap usages; +// try { +// usages = getDataService().findAllUsages(getDataSource(), bean); +// } catch (DataSourceException e) { +// ErrorDialogUI.showError(e); +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// return; +// } DecoratorService dService = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = dService.getDecoratorByType(bean.getClass()); String type = DecoratorService.getEntityLabel(bean.getClass()); @@ -337,7 +332,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content ContentReferenceUI<E> ui = getUi(); UsagesUI usagesUI = new UsagesUI(ui); - usagesUI.init(message, null, null, usages); + //FIXME + usagesUI.init(message, null, null, null); UIHelper.askUser(ui, t("observe.title.show.usage"), @@ -355,18 +351,19 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content */ public void showTechnicalInformations(JButton button) { - ReferenceEntity bean = getModel().isEditing() ? getBean() : getModel().getSelectedBean(); + ReferentialDto bean = getModel().isEditing() ? getBean() : getModel().getSelectedBean(); JPanel content = new JPanel(new SpringLayout()); content.add(new JLabel(t("observe.common.topiaId"))); - content.add(new JLabel(bean.getTopiaId())); + content.add(new JLabel(bean.getId())); - content.add(new JLabel(t("observe.common.topiaCreateDate"))); - content.add(new JLabel(bean.getTopiaCreateDate().toString())); - - content.add(new JLabel(t("observe.common.topiaVersion"))); - content.add(new JLabel(bean.getTopiaVersion() + "")); + //FIXME +// content.add(new JLabel(t("observe.common.topiaCreateDate"))); +// content.add(new JLabel(bean.getTopiaCreateDate().toString())); +// +// content.add(new JLabel(t("observe.common.topiaVersion"))); +// content.add(new JLabel(bean.getTopiaVersion() + "")); SpringUtilities.makeCompactGrid(content, 3, 2, 5, 5, 5, 5); @@ -412,15 +409,15 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content public void openUI() throws Exception { super.openUI(); - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); ContentReferenceUI<E> ui = getUi(); - if (I18nReferenceEntity.class.isAssignableFrom(model.getBeanType())) { + if (I18nReferentialDto.class.isAssignableFrom(model.getBeanType())) { // on met en gras le libelle selectionne en base - ReferenceLocale localeEnum; - localeEnum = ReferenceLocale.valueOf( + ReferentialLocale localeEnum; + localeEnum = ReferentialLocale.valueOf( ui.getConfig().getDbLocale()); String libelleName = localeEnum.getLibelle() + "Label"; for (int i = 1; i <= 8; i++) { @@ -473,7 +470,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content ContentReferenceUI<E> ui = getUi(); - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); E bean = model.getBean(); ContentMode mode = model.getMode(); @@ -490,16 +487,17 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content addInfoMessage(t("observe.message.creating.referentiel")); // creation mode - try { - getDataService().preCreate(getDataSource(), - null, - bean, - getLoadBinder(), - getPreCreateExecutor() - ); - } catch (DataSourceException e) { - ErrorDialogUI.showError(e); - } + //FIXME +// try { +// getDataService().preCreate(getDataSource(), +// null, +// bean, +// getLoadBinder(), +// getPreCreateExecutor() +// ); +// } catch (DataSourceException e) { +// ErrorDialogUI.showError(e); +// } } else { addInfoMessage(t("observe.message.updating.referentiel")); @@ -556,7 +554,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content log.debug("Will create new entity [" + getModel().getBeanType() + "]"); } - getLoadBinder().load(null, getBean(), true); + //FIXME +// getLoadBinder().load(null, getBean(), true); // on demarre l'edition ui.startEdit(null); @@ -564,14 +563,15 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content public void modifyUI() { - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); if (model.getMode() != ContentMode.READ) { // force le mode mise a jour model.setMode(ContentMode.UPDATE); } - getLoadBinder().load(model.getSelectedBean(), getBean(), true); + //FIXME +// getLoadBinder().load(model.getSelectedBean(), getBean(), true); getUi().startEdit(null); } @@ -581,7 +581,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content super.stopEditUI(); ContentReferenceUI<E> ui = getUi(); - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); if (model.getMode() != ContentMode.READ) { @@ -605,199 +605,205 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } public void backToList() { - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); if (!model.isModified() || checkEdit(getUi())) { getUi().stopEdit(); // then resynch the selected bean to edit bean (used for // example to delete)... // repush selected bean to bean - getLoadBinder().load(model.getSelectedBean(), getBean(), true); - } - } - - @Override - protected boolean doSave(E bean, - DataService dataService, - DataSource dataSource, - TopiaEntityBinder<E> binder) throws Exception { - - ContentReferenceUIModel<EDto> model = getModel(); - - if (bean.getTopiaId() == null) { - - if (log.isInfoEnabled()) { - log.info("Create referentiel " + bean); - } - dataService.create(dataSource, - null, - bean, - binder, - getCreateExecutor() - ); - - if (bean instanceof Program) { - - // add the program in tree - ObserveTreeHelper treeHelper = getTreeHelper(getUi()); - treeHelper.addProgram((Program) bean); - } - - return true; - } - - if (log.isInfoEnabled()) { - log.info("Will update exisintg entity : " + bean.getTopiaId()); - } - // le bean original - E oldBean = model.getSelectedBean(); - - if (oldBean != null && - oldBean.getStatus() == ReferenceStatus.enabled && - bean.getStatus() == ReferenceStatus.disabled) { - - // l'entite a ete desactive - // on recherche les objets utilisant cette entitee - // on indique a l'utilisateur ce changement - if (log.isDebugEnabled()) { - log.debug("entity status was desactivated, looking " + - "for usage"); - } - EntityMap usages = dataService.findAllUsages(dataSource, bean); - - if (usages.isEmpty()) { - if (log.isInfoEnabled()) { - log.info("No usage found, no warning to display"); - } - } else { - // some usages were found - boolean willsave = showUsagesForDesactivated(getUi(), bean, - usages); - if (!willsave) { - if (log.isDebugEnabled()) { - log.debug("User refuses to continue, skip " + - "saving..."); - } - return false; - } - } - } - // sauvegarde du bean d'edition dans le bean de la base - bean = dataService.update(dataSource, - null, // pas de parent a sauvegarder - bean, - getUpdateExecutor() - ); - - if (bean instanceof Program) { - - // update the program in tree - ObserveTreeHelper treeHelper = getTreeHelper(getUi()); - treeHelper.updateProgram((Program) bean); + //FIXME +// getLoadBinder().load(model.getSelectedBean(), getBean(), true); } - - return true; } - @Override - protected E onUpdate(TopiaContext tx, - Object parentBean, - E beanToSave) throws TopiaException { + //FIXME +// @Override +// protected boolean doSave(E bean, +// DataService dataService, +// DataSource dataSource, +// TopiaEntityBinder<E> binder) throws Exception { +// +// ContentReferenceUIModel<EDto> model = getModel(); +// +// if (bean.getTopiaId() == null) { +// +// if (log.isInfoEnabled()) { +// log.info("Create referentiel " + bean); +// } +// dataService.create(dataSource, +// null, +// bean, +// binder, +// getCreateExecutor() +// ); +// +// if (bean instanceof Program) { +// +// // add the program in tree +// ObserveTreeHelper treeHelper = getTreeHelper(getUi()); +// treeHelper.addProgram((Program) bean); +// } +// +// return true; +// } +// +// if (log.isInfoEnabled()) { +// log.info("Will update exisintg entity : " + bean.getTopiaId()); +// } +// // le bean original +// E oldBean = model.getSelectedBean(); +// +// if (oldBean != null && +// oldBean.getStatus() == ReferenceStatus.enabled && +// bean.getStatus() == ReferenceStatus.disabled) { +// +// // l'entite a ete desactive +// // on recherche les objets utilisant cette entitee +// // on indique a l'utilisateur ce changement +// if (log.isDebugEnabled()) { +// log.debug("entity status was desactivated, looking " + +// "for usage"); +// } +// EntityMap usages = dataService.findAllUsages(dataSource, bean); +// +// if (usages.isEmpty()) { +// if (log.isInfoEnabled()) { +// log.info("No usage found, no warning to display"); +// } +// } else { +// // some usages were found +// boolean willsave = showUsagesForDesactivated(getUi(), bean, +// usages); +// if (!willsave) { +// if (log.isDebugEnabled()) { +// log.debug("User refuses to continue, skip " + +// "saving..."); +// } +// return false; +// } +// } +// } +// // sauvegarde du bean d'edition dans le bean de la base +// bean = dataService.update(dataSource, +// null, // pas de parent a sauvegarder +// bean, +// getUpdateExecutor() +// ); +// +// if (bean instanceof Program) { +// +// // update the program in tree +// ObserveTreeHelper treeHelper = getTreeHelper(getUi()); +// treeHelper.updateProgram((Program) bean); +// } +// +// return true; +// } - getLoadBinder().copy(getBean(), beanToSave); - return beanToSave; - } + //FIXME +// @Override +// protected E onUpdate(TopiaContext tx, +// Object parentBean, +// E beanToSave) throws TopiaException { +// +// getLoadBinder().copy(getBean(), beanToSave); +// return beanToSave; +// } + //FIXME @Override - protected boolean doDelete(E bean, - DataService dataService, - DataSource dataSource, - TopiaExecutor2<? extends TopiaEntity, E> deletor) throws Exception { - - ContentReferenceUI<E> ui = getUi(); - ContentReferenceUIModel<EDto> model = getModel(); - - if (log.isInfoEnabled()) { - log.info("entity to be deleted, looking for usage"); - } - - // recherche des utilisation du bean dans la base - EntityMap usages = dataService.findAllUsages(getDataSource(), bean); - - if (usages.isEmpty()) { - if (log.isDebugEnabled()) { - log.debug("No usage found, no warning to display"); - } - } else { - - // some usages were found - if (log.isDebugEnabled()) { - log.debug("can not delete referentiel entity (found usages)"); - } - showUsagesForDelete(ui, bean, usages); - return false; - } - - if (!UIHelper.confirmForEntityDelete(ui, model.getBeanType(), bean)) { - return false; - } - - String beanId = bean.getTopiaId(); - dataService.delete(dataSource, null, bean, deletor); - - if (bean instanceof Program) { - - // remove the program in tree - ObserveTreeHelper treeHelper = getTreeHelper(getUi()); - treeHelper.removeProgram(beanId); - } - return true; - } +// protected boolean doDelete(E bean, +// DataService dataService, +// DataSource dataSource, +// TopiaExecutor2<? extends TopiaEntity, E> deletor) throws Exception { +// +// ContentReferenceUI<E> ui = getUi(); +// ContentReferenceUIModel<EDto> model = getModel(); +// +// if (log.isInfoEnabled()) { +// log.info("entity to be deleted, looking for usage"); +// } +// +// // recherche des utilisation du bean dans la base +// EntityMap usages = dataService.findAllUsages(getDataSource(), bean); +// +// if (usages.isEmpty()) { +// if (log.isDebugEnabled()) { +// log.debug("No usage found, no warning to display"); +// } +// } else { +// +// // some usages were found +// if (log.isDebugEnabled()) { +// log.debug("can not delete referentiel entity (found usages)"); +// } +// showUsagesForDelete(ui, bean, usages); +// return false; +// } +// +// if (!UIHelper.confirmForEntityDelete(ui, model.getBeanType(), bean)) { +// return false; +// } +// +// String beanId = bean.getTopiaId(); +// dataService.delete(dataSource, null, bean, deletor); +// +// if (bean instanceof Program) { +// +// // remove the program in tree +// ObserveTreeHelper treeHelper = getTreeHelper(getUi()); +// treeHelper.removeProgram(beanId); +// } +// return true; +// } - @Override - protected void onDelete(TopiaContext tx, - Object parentBean, - E beanToDelete) throws TopiaException { - TopiaDAO<E> dao = getDataSource().getDAO(tx, beanToDelete); - dao.delete(beanToDelete); - } + //FIXME +// @Override +// protected void onDelete(TopiaContext tx, +// Object parentBean, +// E beanToDelete) throws TopiaException { +// TopiaDAO<E> dao = getDataSource().getDAO(tx, beanToDelete); +// dao.delete(beanToDelete); +// } - @Override protected void afterSave(boolean refresh) { super.afterSave(refresh); getUi().stopEdit(); } - @Override - protected E onPreCreate(TopiaContext tx, - Object parent, - E bean) throws TopiaException { - - // par defaut, les objets en creation sont activés - bean.setTopiaId(null); - bean.setTopiaCreateDate(null); - bean.setTopiaVersion(0); - bean.setStatus(ReferenceStatus.enabled); - return bean; - } - - @Override - protected final E onCreate(TopiaContext tx, - Object parent, - E editBean) throws TopiaException { - - // obtention du dictionnaire de la clef metier - Map<String, Object> properties = - getLoadBinder().obtainProperties(editBean, getModel().getNaturalIds()); - - // creation de l'entite - TopiaDAO<E> dao = getDataSource().getDAO(tx, getModel().getBeanType()); - E beanToSave = dao.create(properties); + //FIXME +// @Override +// protected E onPreCreate(TopiaContext tx, +// Object parent, +// E bean) throws TopiaException { +// +// // par defaut, les objets en creation sont activés +// bean.setTopiaId(null); +// bean.setTopiaCreateDate(null); +// bean.setTopiaVersion(0); +// bean.setStatus(ReferenceStatus.enabled); +// return bean; +// } - // application du topiaId sur le bean d'édition - editBean.setTopiaId(beanToSave.getTopiaId()); - return beanToSave; - } + //FIXME +// @Override +// protected final E onCreate(TopiaContext tx, +// Object parent, +// E editBean) throws TopiaException { +// +// // obtention du dictionnaire de la clef metier +// Map<String, Object> properties = +// getLoadBinder().obtainProperties(editBean, getModel().getNaturalIds()); +// +// // creation de l'entite +// TopiaDAO<E> dao = getDataSource().getDAO(tx, getModel().getBeanType()); +// E beanToSave = dao.create(properties); +// +// // application du topiaId sur le bean d'édition +// editBean.setTopiaId(beanToSave.getTopiaId()); +// return beanToSave; +// } public <I> int[] updateIndices(JList jlist, Collection<I> list) { if (log.isDebugEnabled()) { @@ -826,8 +832,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } public boolean canSeeI18nTable(E bean) { - return bean instanceof I18nReferenceEntity || - bean instanceof VesselSizeCategory; + return bean instanceof I18nReferentialDto || + bean instanceof VesselSizeCategoryDto; } public void decorateUniqueKeyTable(JTable table, 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 6bde997..39417f4 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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ContentUI - superGenericType='Program' + superGenericType='ProgramDto'

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 897877d..381f935 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,6 +24,7 @@ package fr.ird.observe.ui.content.ref; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -33,7 +34,7 @@ import fr.ird.observe.ui.content.ContentUIHandler; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ReferenceHomeUIHandler extends ContentUIHandler<Program> { +public class ReferenceHomeUIHandler extends ContentUIHandler<ProgramDto> { public ReferenceHomeUIHandler(ReferenceHomeUI ui) { super(ui, null, 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 a8d8bad..3d2430b 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 @@ -27,6 +27,8 @@ import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.content.ObserveContentUI; @@ -36,8 +38,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import javax.swing.JList; import javax.swing.ListCellRenderer; @@ -71,10 +71,13 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend * des entités * @since 1.5 */ - public static <E extends TopiaEntity> void prepareEntityList(DataSource storageService, + public static <E extends AbstractObserveDto> void prepareEntityList(DataSource storageService, Class<E> entityClass, BeanListHeader<E> list, - TopiaEntityBinder<E> loador) throws DataSourceException { + Object loador + //FIXME +// TopiaEntityBinder<E> loador + ) throws DataSourceException { ObserveContext tx = ObserveContext.get(); @@ -133,7 +136,7 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend if ("listHeader".equals(beanList.getName())) { // use the binder for loading - prepareEntityList(service, beanList.getBeanType(), beanList, ui.getModel().getLoadBinder()); + prepareEntityList(service, beanList.getBeanType(), beanList, null);//FIXME ui.getModel().getLoadBinder()); } else { @@ -145,12 +148,12 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend Object init = jlist.getClientProperty("addDecorator"); if (init != null) { - Class<TopiaEntity> klass = (Class<TopiaEntity>) init; + Class<AbstractObserveDto> klass = (Class<AbstractObserveDto>) init; if (log.isDebugEnabled()) { log.debug("addDecorator to list " + jlist.getName()); } - Decorator<TopiaEntity> decorator; + Decorator<AbstractObserveDto> decorator; decorator = decoratorService.getDecoratorByType(klass); jlist.putClientProperty("decorator", decorator); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css index 9d50757..f31f265 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css @@ -26,7 +26,7 @@ } #gearCaracteristicType { - property:{GearCaracteristic.PROPERTY_GEAR_CARACTERISTIC_TYPE}; + property:{GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE}; bean:{bean}; selectedItem:{bean.getGearCaracteristicType()}; showReset:{true}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css index 731fe9d..72620c4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css @@ -40,8 +40,10 @@ } #gearCaracteristic { - property:{Gear.PROPERTY_GEAR_CARACTERISTIC}; - selected:{bean.getGearCaracteristic()}; + //FIXME + //property:{GearDto.PROPERTY_GEAR_CARACTERISTIC}; + //FIXME + //selected:{bean.getGearCaracteristic()}; _validatorLabel: {t("observe.gear.gearCaracteristic")}; showListLabel: true; universeLabel:{t("observe.gear.availableGearCaracteristic")}; 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 3a3a664..1f3c332 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 @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUIHandler extends ContentReferenceUIHandler<Gear> { +public class GearUIHandler extends ContentReferenceUIHandler<GearDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class GearUIHandler extends ContentReferenceUIHandler<Gear> { } }; - public GearUIHandler(ContentReferenceUI<Gear> ui) { + public GearUIHandler(ContentReferenceUI<GearDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class GearUIHandler extends ContentReferenceUIHandler<Gear> { } @Override - public void selectBean(Gear selectedBean) { + public void selectBean(GearDto selectedBean) { super.selectBean(selectedBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css index 6be56fe..e653e81 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css @@ -55,9 +55,9 @@ } #coordinates { - propertyLatitude:{Harbour.PROPERTY_LATITUDE}; - propertyLongitude:{Harbour.PROPERTY_LONGITUDE}; - propertyQuadrant:{Harbour.PROPERTY_QUADRANT}; + propertyLatitude:{HarbourDto.PROPERTY_LATITUDE}; + propertyLongitude:{HarbourDto.PROPERTY_LONGITUDE}; + propertyQuadrant:{HarbourDto.PROPERTY_QUADRANT}; latitude:{bean.getLatitude()}; longitude:{bean.getLongitude()}; quadrant:{bean.getQuadrant()}; 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 a127bc5..b387c93 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 @@ -36,7 +36,7 @@ public class HarbourUIModel extends ContentReferenceUIModel<HarbourDto> { private static final long serialVersionUID = 1L; public HarbourUIModel() { - super(Harbour.class, + super(HarbourDto.class, new String[]{HarbourDto.PROPERTY_NAME, HarbourDto.PROPERTY_COUNTRY, HarbourDto.PROPERTY_LOCODE, 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 9f320e7..0e3a1d9 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 @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<LengthWeightParameter> { +public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<LengthWeightParameterDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<Le } }; - public LengthWeightParameterUIHandler(ContentReferenceUI<LengthWeightParameter> ui) { + public LengthWeightParameterUIHandler(ContentReferenceUI<LengthWeightParameterDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<Le } @Override - public void selectBean(LengthWeightParameter selectedBean) { + public void selectBean(LengthWeightParameterDto selectedBean) { super.selectBean(selectedBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css index 603c2b5..e1e7fbf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css @@ -68,7 +68,7 @@ } #country { - property:{Person.PROPERTY_COUNTRY}; + property:{PersonDto.PROPERTY_COUNTRY}; bean:{bean}; selectedItem:{bean.getCountry()}; showReset:{true}; 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 2274dda..84aac6b 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 @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class ProgramUIHandler extends ContentReferenceUIHandler<Program> { +public class ProgramUIHandler extends ContentReferenceUIHandler<ProgramDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class ProgramUIHandler extends ContentReferenceUIHandler<Program> { } }; - public ProgramUIHandler(ContentReferenceUI<Program> ui) { + public ProgramUIHandler(ContentReferenceUI<ProgramDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class ProgramUIHandler extends ContentReferenceUIHandler<Program> { } @Override - public void selectBean(Program selectedBean) { + public void selectBean(ProgramDto selectedBean) { super.selectBean(selectedBean); 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 ebca2fa..83e1c2e 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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Sex' + superGenericType='SexDto' contentTitle='{n("observe.title.content.sexx")}' listText='{n("observe.list.sex")}' createToolTip='{n("observe.action.sex.create.tip")}' diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css index 1915ed9..0f670ec 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css @@ -40,8 +40,10 @@ } #species { - property: species; - selected:{bean.getSpecies()}; + //FIXME + //property: species; + //FIXME + //selected:{bean.getSpecies()}; _validatorLabel: {t("observe.common.species")}; showListLabel: true; universeLabel:{t("observe.speciesList.availableSpecies")}; 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 87a4b59..7969a5f 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 @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesList> { +public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesListDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesList> } }; - public SpeciesListUIHandler(ContentReferenceUI<SpeciesList> ui) { + public SpeciesListUIHandler(ContentReferenceUI<SpeciesListDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesList> } @Override - public void selectBean(SpeciesList selectedBean) { + public void selectBean(SpeciesListDto selectedBean) { super.selectBean(selectedBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css index 96c6334..452a8e4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css @@ -70,7 +70,8 @@ #ocean { property: ocean; - selected:{bean.getOcean()}; + //FIXME + //selected:{bean.getOcean()}; _validatorLabel: {t("observe.common.ocean")}; showListLabel: true; universeLabel:{t("observe.species.availableOcean")}; 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 ca42586..f85adb8 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 @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class SpeciesUIHandler extends ContentReferenceUIHandler<Species> { +public class SpeciesUIHandler extends ContentReferenceUIHandler<SpeciesDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class SpeciesUIHandler extends ContentReferenceUIHandler<Species> { } }; - public SpeciesUIHandler(ContentReferenceUI<Species> ui) { + public SpeciesUIHandler(ContentReferenceUI<SpeciesDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class SpeciesUIHandler extends ContentReferenceUIHandler<Species> { } @Override - public void selectBean(Species selectedBean) { + public void selectBean(SpeciesDto selectedBean) { super.selectBean(selectedBean); 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 057579b..90dec36 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 @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class VesselUIHandler extends ContentReferenceUIHandler<Vessel> { +public class VesselUIHandler extends ContentReferenceUIHandler<VesselDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class VesselUIHandler extends ContentReferenceUIHandler<Vessel> { } }; - public VesselUIHandler(ContentReferenceUI<Vessel> ui) { + public VesselUIHandler(ContentReferenceUI<VesselDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class VesselUIHandler extends ContentReferenceUIHandler<Vessel> { } @Override - public void selectBean(Vessel selectedBean) { + public void selectBean(VesselDto selectedBean) { super.selectBean(selectedBean); 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 af24152..1a43b66 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 @@ -47,7 +47,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.seine.ObservedSystem' + beanClass='fr.ird.observe.services.dto.referential.seine.ObservedSystemDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> 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 f28325e..1861114 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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='TransmittingBuoyType' + superGenericType='TransmittingBuoyTypeDto' contentTitle='{n("observe.title.content.transmittingBuoyTypes")}' listText='{n("observe.list.transmittingBuoyType")}' createToolTip='{n("observe.action.transmittingBuoyType.create.tip")}' @@ -37,7 +37,7 @@ <import> fr.ird.observe.services.dto.constants.ReferenceStatus - fr.ird.observe.services.dto.referential.seine.TransmittingBuoyType + fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto 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.services.dto.referential.seine.TransmittingBuoyType' + beanClass='fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <TransmittingBuoyTypeUIModel id='model'/> <!-- edit bean --> - <TransmittingBuoyType id='bean'/> + <TransmittingBuoyTypeDto id='bean'/> <Table id='editTable'> 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 046db82..cbf8ba3 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 @@ -87,7 +87,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> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css index c157180..8901b79 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css @@ -47,6 +47,6 @@ BeanComboBox { } #comment2 { - _propertyName: {CommentableEntity.PROPERTY_COMMENT}; + _propertyName: {CommentableDto.PROPERTY_COMMENT}; text:{getStringValue(bean.getComment())}; } \ No newline at end of file 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 a114d48..cd256c5 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 @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.table; import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.UIHelper; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.validator.swing.SwingValidator; @@ -30,12 +31,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import javax.swing.JOptionPane; +import javax.swing.*; import javax.swing.table.AbstractTableModel; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.List; @@ -69,7 +69,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractObserveDto> extends AbstractTableModel { +public class ContentTableModel<P extends AbstractObserveDto, B extends IdDto> extends AbstractTableModel { /** Le nom de la propriété de la ligne en cours d'édition */ public static final String SELECTED_ROW_PROPERTY = "selectedRow"; @@ -397,7 +397,8 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO beanToBind = getValueAt(row); // on charge le bean d'edition - getChildLoador().load(beanToBind, getRowBean(), true); + //FIXME +// getChildLoador().load(beanToBind, getRowBean(), true); // on modifie la ligne d'edition setSelectedRow(row); @@ -419,7 +420,8 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO // mettre a jour la ligne B bean = getValueAt(editingRow); - getChildLoador().load(getRowBean(), bean, true); + //FIXME +// getChildLoador().load(getRowBean(), bean, true); fireTableRowsUpdated(editingRow, editingRow); if (create) { @@ -443,7 +445,8 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO public void resetEditBean() { B bean = getValueAt(getSelectedRow()); - getChildLoador().load(bean, getRowBean(), true); + //FIXME +// getChildLoador().load(bean, getRowBean(), true); // plus de modification sur le bean d'edition getValidator().setChanged(false); } @@ -454,15 +457,17 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO return handler; } - protected Loador<B> getChildLoador() { - ContentTableUIModel<P, B> model = getModel(); - return model.getChildLoador(); - } + //FIXME +// protected Loador<B> getChildLoador() { +// ContentTableUIModel<P, B> model = getModel(); +// return model.getChildLoador(); +// } - protected EntityListUpdator<P, B> getChildsUpdator() { - ContentTableUIModel<P, B> model = getModel(); - return model.getChildsUpdator(); - } + //FIXME +// protected EntityListUpdator<P, B> getChildsUpdator() { +// ContentTableUIModel<P, B> model = getModel(); +// return model.getChildsUpdator(); +// } protected P getBean() { ContentTableUIModel<P, B> model = getModel(); @@ -537,12 +542,13 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO // on recupere donc la liste a partir du bean principal P bean = getBean(); - Collection<B> childs = getChildsUpdator().getChilds(bean); - if (childs == null || childs.isEmpty()) { - data = new ArrayList<B>(); - } else { - data = new ArrayList<B>(childs); - } + //FIXME +// Collection<B> childs = getChildsUpdator().getChilds(bean); +// if (childs == null || childs.isEmpty()) { +// data = new ArrayList<B>(); +// } else { +// data = new ArrayList<B>(childs); +// } } else { // le modèle n'est pas encore initialisé // on retourne donc une liste vide @@ -730,7 +736,8 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO // on repositionne la liste sur le bean principal // pour avoir la validation en temps reel sur le bean principal - getChildsUpdator().setChilds(getBean(), data); + //FIXME +// getChildsUpdator().setChilds(getBean(), data); parentValidator.doValidate(); if (!shouldChanged && !wasChanged) { // on repositionne le drapeau changed a faux 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 565bbaf..acf9cb9 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 AbstractObserveDto, D extends AbstractObserveDto'> + genericType='E extends IdDto, D extends IdDto'> <import> fr.ird.observe.ui.actions.shared.ResetEditUIAction @@ -33,6 +33,7 @@ jaxx.runtime.validator.swing.SwingValidator fr.ird.observe.services.dto.AbstractObserveDto + fr.ird.observe.services.dto.IdDto java.awt.Dimension @@ -72,7 +73,7 @@ <!-- le bloqueur de l'editeur d'une entrée du tableau --> <BlockingLayerUI id='editorBlockLayerUI'/> - <AbstractObserveDto id='tableEditBean' initializer='getModel().getTableEditBean()'/> + <IdDto 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 3463f60..031cef8 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 @@ -21,15 +21,13 @@ */ package fr.ird.observe.ui.content.table; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.AbstractObserveDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -39,12 +37,6 @@ import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.Loador; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -69,7 +61,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D extends AbstractObserveDto> extends ContentUIHandler<E> { +public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D extends IdDto> extends ContentUIHandler<E> { /** Logger */ private static Log log = LogFactory.getLog(ContentTableUIHandler.class); @@ -192,66 +184,70 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte protected abstract void initTableUI(DefaultTableCellRenderer renderer); - protected abstract String getEditBeanIdToLoad(DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException; - - protected E loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); - - if (id == null) { - throw new IllegalStateException("Could not find id form " + this); - } - - E editBean = getBean(); - - // preparation du bean d'édition - dataService.loadEditEntity(dataSource, id, getLoadExecutor()); - - getModel().setMode(mode); - - // initialisation du modèle du tableau - getUi().getTableModel().attachModel(); - - return editBean; - } - - @Override - protected final void onLoad(TopiaContext tx, E bean) throws TopiaException { - super.onLoad(tx, bean); - - // on duplique la liste des fils traites dans le tableau - // sinon on reste sur les references d'origine et on aura pas - // la possibilité d'annuler l'edition ensuite car on aura modifie - // les entrées d'origine... - E editBean = getBean(); - Collection<D> data = loadChilds(tx, editBean); - getModel().getChildsUpdator().setChilds(editBean, data); - } - - protected Collection<D> loadChilds(TopiaContext tx, E bean) throws TopiaException { - Collection<D> childs = getModel().getChildsUpdator().getChilds(bean); - Collection<D> data = new ArrayList<D>(); - if (CollectionUtils.isNotEmpty(childs)) { - Loador<D> loader = getModel().getChildLoador(); - TopiaDAO<D> dao = getDataSource().getDAO(tx, getTableEditBean()); - for (D c : childs) { - try { - D cUp = dao.findByTopiaId(c.getTopiaId()); - D c2 = getModel().newTableEditBean(); - loader.load(cUp, c2, true); - data.add(c2); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - return data; - } + //FIXME +// protected abstract String getEditBeanIdToLoad(DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException; + + //FIXME +// protected E loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); +// +// if (id == null) { +// throw new IllegalStateException("Could not find id form " + this); +// } +// +// E editBean = getBean(); +// +// // preparation du bean d'édition +// dataService.loadEditEntity(dataSource, id, getLoadExecutor()); +// +// getModel().setMode(mode); +// +// // initialisation du modèle du tableau +// getUi().getTableModel().attachModel(); +// +// return editBean; +// } + + //FIXME +// @Override +// protected final void onLoad(TopiaContext tx, E bean) throws TopiaException { +// super.onLoad(tx, bean); +// +// // on duplique la liste des fils traites dans le tableau +// // sinon on reste sur les references d'origine et on aura pas +// // la possibilité d'annuler l'edition ensuite car on aura modifie +// // les entrées d'origine... +// E editBean = getBean(); +// Collection<D> data = loadChilds(tx, editBean); +// getModel().getChildsUpdator().setChilds(editBean, data); +// } + + //FIXME +// protected Collection<D> loadChilds(TopiaContext tx, E bean) throws TopiaException { +// Collection<D> childs = getModel().getChildsUpdator().getChilds(bean); +// Collection<D> data = new ArrayList<D>(); +// if (CollectionUtils.isNotEmpty(childs)) { +// Loador<D> loader = getModel().getChildLoador(); +// TopiaDAO<D> dao = getDataSource().getDAO(tx, getTableEditBean()); +// for (D c : childs) { +// try { +// D cUp = dao.findByTopiaId(c.getTopiaId()); +// D c2 = getModel().newTableEditBean(); +// loader.load(cUp, c2, true); +// data.add(c2); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } +// } +// return data; +// } @Override public void initUI() throws Exception { @@ -264,16 +260,19 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte public Set<String> loadSpeciesList(String speciesListId, String errorMessage) { - Set<String> speciesIds; - try { - speciesIds = getDataService().getSpeciesListSpeciesIds(getDataSource(), speciesListId); - } catch (Exception e) { - - UIHelper.displayWarning(t("observe.title.speciesList.not.found"), t(errorMessage)); - speciesIds = Collections.emptySet(); + //FIXME +// Set<String> speciesIds; +// try { +// speciesIds = getDataService().getSpeciesListSpeciesIds(getDataSource(), speciesListId); +// } catch (Exception e) { +// +// UIHelper.displayWarning(t("observe.title.speciesList.not.found"), t(errorMessage)); +// speciesIds = Collections.emptySet(); +// +// } +// return speciesIds; - } - return speciesIds; + return null; } @@ -281,9 +280,10 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte protected void prepareSpeciesList(String speciesListId, JComponent speciesComponent, String errorMessage) throws DataSourceException { Set<String> speciesIds = loadSpeciesList(speciesListId, errorMessage); - speciesComponent.putClientProperty( - ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE, - Species2.newSpeciesByIdPredicate(speciesIds)); + //FIXME +// speciesComponent.putClientProperty( +// ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE, +// Species2.newSpeciesByIdPredicate(speciesIds)); } @Override @@ -301,7 +301,8 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte ui.getTableModel().dettachModel(); // chargement du bean d'édition - loadEditBean(mode, getDataContext(), getDataService(), getDataSource()); + //FIXME +// loadEditBean(mode, getDataContext(), getDataService(), getDataSource()); boolean canEdit = mode == ContentMode.UPDATE; @@ -359,97 +360,100 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte } } - @Override - protected boolean doSave(E bean, - DataService dataService, - DataSource dataSource, - TopiaEntityBinder<E> binder) throws Exception { - - ObserveContentTableUI<E, D> ui = getUi(); - - List<D> objets = ui.getTableModel().getData(); - - boolean canContinue; - try { - canContinue = prepareSave(bean, objets); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error(e); - } - ErrorDialogUI.showError(e); - canContinue = false; - } - if (!canContinue) { - - // l'utilisateur a choisi de ne pas sauvegarder - return false; - } - doPersist(bean, dataService, dataSource); - - - return true; - } - - protected void doPersist(E bean, DataService dataService, DataSource dataSource) throws DataSourceException { - // sauvegarde du bean en base - dataService.update(dataSource, null, bean, getUpdateExecutor()); - } - - @Override - protected E onUpdate(TopiaContext tx, Object parentBean, E beanToSave) throws TopiaException { - - List<D> childs = getUi().getTableModel().getData(); - - E editBean = getBean(); - - TopiaEntityBinder<E> binder = getLoadBinder(); - - Loador<D> childBinder = getModel().getChildLoador(); - - EntityListUpdator<E, D> childUpdator = getModel().getChildsUpdator(); - - // recopie des propriétés du bean en excluant toujours la liste des fils - binder.copyExcluding(editBean, beanToSave, childUpdator.getPropertyName()); - - // on conserve l'ancienne liste des fils (pour traitement ultérieure) - Collection<D> oldChilds = - new ArrayList<D>(childUpdator.getChilds(beanToSave)); - - // suppression des fils dans le bean a sauver - childUpdator.removeAll(beanToSave); - - TopiaDAO<D> dao = ObserveDAOHelper.getDAO(tx, getModel().getChildType()); - - for (D child : childs) { - - D childToSave; - - if (child.getTopiaId() == null) { - - // creation du fils - Map<String, Object> map = childBinder.obtainProperties(child); - - childToSave = dao.create(map); - - } else { - - // mise a jour du fils - - childToSave = dao.findByTopiaId(child.getTopiaId()); - - childBinder.load(child, childToSave, false); - } - - // ajout du fils au bean à sauver - childUpdator.addToList(beanToSave, childToSave); - } - - // on donne la main aux implantations pour faire des traitements - // supplémentaires - onUpdateFinalize(tx, beanToSave, oldChilds); - - return beanToSave; - } + //FIXME +// @Override +// protected boolean doSave(E bean, +// DataService dataService, +// DataSource dataSource, +// TopiaEntityBinder<E> binder) throws Exception { +// +// ObserveContentTableUI<E, D> ui = getUi(); +// +// List<D> objets = ui.getTableModel().getData(); +// +// boolean canContinue; +// try { +// canContinue = prepareSave(bean, objets); +// } catch (Exception e) { +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// ErrorDialogUI.showError(e); +// canContinue = false; +// } +// if (!canContinue) { +// +// // l'utilisateur a choisi de ne pas sauvegarder +// return false; +// } +// doPersist(bean, dataService, dataSource); +// +// +// return true; +// } + + //FIXME +// protected void doPersist(E bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// // sauvegarde du bean en base +// dataService.update(dataSource, null, bean, getUpdateExecutor()); +// } + + //FIXME +// @Override +// protected E onUpdate(TopiaContext tx, Object parentBean, E beanToSave) throws TopiaException { +// +// List<D> childs = getUi().getTableModel().getData(); +// +// E editBean = getBean(); +// +// TopiaEntityBinder<E> binder = getLoadBinder(); +// +// Loador<D> childBinder = getModel().getChildLoador(); +// +// EntityListUpdator<E, D> childUpdator = getModel().getChildsUpdator(); +// +// // recopie des propriétés du bean en excluant toujours la liste des fils +// binder.copyExcluding(editBean, beanToSave, childUpdator.getPropertyName()); +// +// // on conserve l'ancienne liste des fils (pour traitement ultérieure) +// Collection<D> oldChilds = +// new ArrayList<D>(childUpdator.getChilds(beanToSave)); +// +// // suppression des fils dans le bean a sauver +// childUpdator.removeAll(beanToSave); +// +// TopiaDAO<D> dao = ObserveDAOHelper.getDAO(tx, getModel().getChildType()); +// +// for (D child : childs) { +// +// D childToSave; +// +// if (child.getTopiaId() == null) { +// +// // creation du fils +// Map<String, Object> map = childBinder.obtainProperties(child); +// +// childToSave = dao.create(map); +// +// } else { +// +// // mise a jour du fils +// +// childToSave = dao.findByTopiaId(child.getTopiaId()); +// +// childBinder.load(child, childToSave, false); +// } +// +// // ajout du fils au bean à sauver +// childUpdator.addToList(beanToSave, childToSave); +// } +// +// // on donne la main aux implantations pour faire des traitements +// // supplémentaires +// onUpdateFinalize(tx, beanToSave, oldChilds); +// +// return beanToSave; +// } @Override protected void afterSave(boolean refresh) { @@ -464,9 +468,10 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte return true; } - protected void onUpdateFinalize(TopiaContext tx, E bean, Collection<D> oldChilds) throws TopiaException { - // par défaut, rien à faire - } + //FIXME +// protected void onUpdateFinalize(TopiaContext tx, E bean, Collection<D> oldChilds) throws TopiaException { +// // par défaut, rien à faire +// } protected ContentTableModel<E, D> getTableModel() { return getUi().getTableModel(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java index 5a77e5b..74c8484 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java @@ -24,23 +24,18 @@ package fr.ird.observe.ui.content.table; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.util.BooleanEditor; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaEntityAbstract; - -import javax.swing.AbstractButton; -import javax.swing.ActionMap; -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.JTextArea; -import javax.swing.JTextField; + +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.BorderLayout; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -58,7 +53,7 @@ import java.beans.PropertyChangeListener; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ContentTableUIInitializer<E extends TopiaEntity, D extends TopiaEntity, UI extends ObserveContentTableUI<E, D>> extends ContentUIInitializer<E, UI> { +public class ContentTableUIInitializer<E extends AbstractObserveDto, D extends IdDto, UI extends ObserveContentTableUI<E, D>> extends ContentUIInitializer<E, UI> { public static final String CLIENT_PROPERTY_TABLE_PROPERTY_NAME = "tablePropertyName"; @@ -86,7 +81,8 @@ public class ContentTableUIInitializer<E extends TopiaEntity, D extends TopiaEnt @Override public void initUI(DataSource dataSource) throws Exception { - attachTopiaContext(dataSource, (TopiaEntityAbstract) getTableEditBean()); + //FIXME +// attachTopiaContext(dataSource, (TopiaEntityAbstract) getTableEditBean()); super.initUI(dataSource); @@ -124,10 +120,10 @@ public class ContentTableUIInitializer<E extends TopiaEntity, D extends TopiaEnt ContentTableModel<E, D> model; model = (ContentTableModel<E, D>) evt.getSource(); D bean = model.getRowBean(); - boolean create = bean.getTopiaId() == null; + boolean create = bean.getId() == null; Integer selectedRow = (Integer) evt.getNewValue(); if (log.isDebugEnabled()) { - log.debug("callback new selectedRow : " + selectedRow + " : " + bean.getTopiaId()); + log.debug("callback new selectedRow : " + selectedRow + " : " + bean.getId()); } getHandler().onSelectedRowChanged(selectedRow, bean, create); getModel().setRowSaved(!create); 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 d658465..d950547 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 @@ -24,6 +24,7 @@ package fr.ird.observe.ui.content.table; import fr.ird.observe.business.BinderService; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.logging.Log; @@ -41,7 +42,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ContentTableUIModel<E extends AbstractObserveDto, D extends AbstractObserveDto> extends ContentUIModel<E> { +public abstract class ContentTableUIModel<E extends AbstractObserveDto, D extends IdDto> extends ContentUIModel<E> { public static final String PROPERTY_CAN_SAVE_ROW = "canSaveRow"; @@ -101,7 +102,7 @@ public abstract class ContentTableUIModel<E extends AbstractObserveDto, D extend this.selectionModel = new ContentTableListSelectionModel(); } - public static <E extends AbstractObserveDto, D extends AbstractObserveDto> ContentTableUIModel<E, D> newModel(ObserveContentTableUI<E, D> ui) { + public static <E extends AbstractObserveDto, D extends IdDto> ContentTableUIModel<E, D> newModel(ObserveContentTableUI<E, D> ui) { String uiName = ui.getClass().getName(); String modelName = uiName + "Model"; 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 390c638..b291679 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 @@ -23,6 +23,7 @@ package fr.ird.observe.ui.content.table; */ import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ObserveContentUI; import jaxx.runtime.swing.BlockingLayerUI; import jaxx.runtime.validator.swing.SwingValidator; @@ -37,7 +38,7 @@ import javax.swing.ListSelectionModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public interface ObserveContentTableUI<E extends AbstractObserveDto, D extends AbstractObserveDto> extends ObserveContentUI<E> { +public interface ObserveContentTableUI<E extends AbstractObserveDto, D extends IdDto> 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.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css index 6236539..a1e437f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css @@ -26,7 +26,7 @@ } #baitType { - property:{BaitsComposition.PROPERTY_BAIT_TYPE}; + property:{BaitsCompositionDto.PROPERTY_BAIT_TYPE}; selectedItem:{tableEditBean.getBaitType()}; _validatorLabel:{t("observe.baitsComposition.baitType")}; } @@ -37,7 +37,7 @@ } #baitSettingStatus { - property:{BaitsComposition.PROPERTY_BAIT_SETTING_STATUS}; + property:{BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS}; selectedItem:{tableEditBean.getBaitSettingStatus()}; _validatorLabel:{t("observe.baitsComposition.baitSettingStatus")}; } @@ -48,7 +48,7 @@ } #individualSize { - property:{BaitsComposition.PROPERTY_INDIVIDUAL_SIZE}; + property:{BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE}; model:{tableEditBean.getIndividualSize()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.baitsComposition.individualSize")}; @@ -60,7 +60,7 @@ } #individualWeight { - property:{BaitsComposition.PROPERTY_INDIVIDUAL_WEIGHT}; + property:{BaitsCompositionDto.PROPERTY_INDIVIDUAL_WEIGHT}; model:{tableEditBean.getIndividualWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.baitsComposition.individualWeight")}; @@ -72,7 +72,7 @@ } #proportion { - property:{BaitsComposition.PROPERTY_PROPORTION}; + property:{BaitsCompositionDto.PROPERTY_PROPORTION}; model:{tableEditBean.getProportion()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.baitsComposition.proportion")}; @@ -84,7 +84,8 @@ } #baitsCompositionProportionSum { - text:{getStringValue(bean.getBaitsCompositionProportionSum())}; + //FIXME + //text:{getStringValue(bean.getBaitsCompositionProportionSum())}; _validatorLabel:{t("observe.baitsComposition.proportionSum")}; font-weight:bold; } 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 249bfdf..8e16430 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 @@ -63,7 +63,8 @@ <BeanValidator id='validator' autoField='true' context='n1-update-baitsComposition' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> - <field name="baitsComposition" component="editorPanel"/> + <!--FIXME--> + <!--<field name="baitsComposition" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> 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 a491312..465fc27 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 @@ -22,16 +22,15 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +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; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -46,7 +45,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline, BaitsComposition> { +public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, BaitsCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(BaitsCompositionUIHandler.class); @@ -61,7 +60,7 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline } @Override - protected void onSelectedRowChanged(int editingRow, BaitsComposition bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, BaitsCompositionDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -90,8 +89,8 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline n("observe.baitsComposition.table.proportion"), n("observe.baitsComposition.table.proportion.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, BaitType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, BaitSettingStatus.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, BaitTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, BaitSettingStatusDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -100,22 +99,25 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline table.getModel().addTableModelListener(new TableModelListener() { @Override public void tableChanged(TableModelEvent e) { - int proportionSum = getBean().getBaitsCompositionProportionSum(); - getBean().setBaitsCompositionProportionSum(proportionSum); + //FIXME +// int proportionSum = getBean().getBaitsCompositionProportionSum(); +// getBean().setBaitsCompositionProportionSum(proportionSum); } }); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } - - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { +// return super.onUpdate(tx, parentBean, beanToSave); +// } @Override public void afterSave(boolean refresh) { 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 677e0c4..038587a 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 @@ -24,6 +24,7 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -44,7 +45,10 @@ public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineDto, public BaitsCompositionUIModel(BaitsCompositionUI ui) { super(SetLonglineDto.class, BaitsCompositionDto.class, - new String[]{SetLonglineDto.PROPERTY_BAITS_COMPOSITION}, + new String[]{ + //FIXME +// SetLonglineDto.PROPERTY_BAITS_COMPOSITION + }, new String[]{BaitsCompositionDto.PROPERTY_BAIT_TYPE, BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css index bc32c71..9be1155 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css @@ -26,7 +26,7 @@ } #topType { - property:{BranchlinesComposition.PROPERTY_TOP_TYPE}; + property:{BranchlinesCompositionDto.PROPERTY_TOP_TYPE}; selectedItem:{tableEditBean.getTopType()}; _validatorLabel:{t("observe.branchlinesComposition.topType")}; } @@ -37,7 +37,7 @@ } #tracelineType { - property:{BranchlinesComposition.PROPERTY_TRACELINE_TYPE}; + property:{BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE}; selectedItem:{tableEditBean.getTracelineType()}; _validatorLabel:{t("observe.branchlinesComposition.tracelineType")}; } @@ -48,7 +48,7 @@ } #length { - property:{BranchlinesComposition.PROPERTY_LENGTH}; + property:{BranchlinesCompositionDto.PROPERTY_LENGTH}; model:{tableEditBean.getLength()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.branchlinesComposition.length")}; @@ -60,7 +60,7 @@ } #proportion { - property:{BranchlinesComposition.PROPERTY_PROPORTION}; + property:{BranchlinesCompositionDto.PROPERTY_PROPORTION}; model:{tableEditBean.getProportion()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.branchlinesComposition.proportion")}; @@ -72,7 +72,8 @@ } #branchlinesCompositionProportionSum { - text:{getStringValue(bean.getBranchlinesCompositionProportionSum())}; + //FIXME + //text:{getStringValue(bean.getBranchlinesCompositionProportionSum())}; _validatorLabel:{t("observe.branchlinesComposition.proportionSum")}; font-weight:bold; } 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 1ef846a..9e4cc79 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 @@ -62,7 +62,8 @@ <BeanValidator id='validator' autoField='true' context='n1-update-branchlinesComposition' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> - <field name="branchlinesComposition" component="editorPanel"/> + <!--FIXME--> + <!--<field name="branchlinesComposition" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> 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 a23f23c..b7948c4 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 @@ -22,16 +22,17 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +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; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -46,7 +47,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLongline, BranchlinesComposition> { +public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, BranchlinesCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(BranchlinesCompositionUIHandler.class); @@ -61,7 +62,7 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo } @Override - protected void onSelectedRowChanged(int editingRow, BranchlinesComposition bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, BranchlinesCompositionDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -88,31 +89,34 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo n("observe.branchlinesComposition.table.proportion"), n("observe.branchlinesComposition.table.proportion.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, HookType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, HookSize.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, HookTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, HookSizeDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); // when model change in table, let's recompute the proportion sum - table.getModel().addTableModelListener(new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - int proportionSum = getBean().getBranchlinesCompositionProportionSum(); - getBean().setBranchlinesCompositionProportionSum(proportionSum); - } - }); - - } + //FIXME +// table.getModel().addTableModelListener(new TableModelListener() { +// @Override +// public void tableChanged(TableModelEvent e) { +// int proportionSum = getBean().getBranchlinesCompositionProportionSum(); +// getBean().setBranchlinesCompositionProportionSum(proportionSum); +// } +// }); - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); } - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { +// return super.onUpdate(tx, parentBean, beanToSave); +// } @Override public void afterSave(boolean refresh) { 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 579f6aa..16d1519 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,6 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.business.db.DataSourceException; +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; @@ -38,7 +40,7 @@ import java.awt.event.ItemListener; * @author Tony Chemit - chemit@codelutin.com * @since 3.15 */ -public class CatchLonglineContentTableUIInitializer extends ContentTableUIInitializer<SetLongline, CatchLongline, CatchLonglineUI> { +public class CatchLonglineContentTableUIInitializer extends ContentTableUIInitializer<SetLonglineDto, CatchLonglineDto, CatchLonglineUI> { /** Logger. */ private static final Log log = LogFactory.getLog(CatchLonglineContentTableUIInitializer.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css index e73822c..9fb70f4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css @@ -71,7 +71,7 @@ } #section { - property:{CatchLongline.PROPERTY_SECTION}; + property:{CatchLonglineDto.PROPERTY_SECTION}; selectedItem:{tableEditBean.getSection()}; _listNoLoad:{true}; } @@ -82,7 +82,7 @@ } #basket { - property:{CatchLongline.PROPERTY_BASKET}; + property:{CatchLonglineDto.PROPERTY_BASKET}; selectedItem:{tableEditBean.getBasket()}; _listNoLoad:{true}; } @@ -93,7 +93,7 @@ } #branchline { - property:{CatchLongline.PROPERTY_BRANCHLINE}; + property:{CatchLonglineDto.PROPERTY_BRANCHLINE}; selectedItem:{tableEditBean.getBranchline()}; _listNoLoad:{true}; } @@ -104,8 +104,10 @@ } #speciesCatch { - property:{CatchLongline.PROPERTY_SPECIES_CATCH}; - selectedItem:{tableEditBean.getSpeciesCatch()}; + //FIXME + //property:{CatchLonglineDto.PROPERTY_SPECIES_CATCH}; + //FIXME + //selectedItem:{tableEditBean.getSpeciesCatch()}; _validatorLabel:{t("observe.catchLongline.speciesCatch")}; } @@ -116,12 +118,12 @@ #resetPhotoReferences{ toolTipText:"observe.catchLongline.action.reset.photoReferences.tip"; - _resetTablePropertyName:{CatchLongline.PROPERTY_PHOTO_REFERENCES}; + _resetTablePropertyName:{CatchLonglineDto.PROPERTY_PHOTO_REFERENCES}; } #photoReferences { text:{getStringValue(tableEditBean.getPhotoReferences())}; - _tablePropertyName:{CatchLongline.PROPERTY_PHOTO_REFERENCES}; + _tablePropertyName:{CatchLonglineDto.PROPERTY_PHOTO_REFERENCES}; } #countLabel { @@ -130,7 +132,7 @@ } #count { - property:{CatchLongline.PROPERTY_COUNT}; + property:{CatchLonglineDto.PROPERTY_COUNT}; model:{tableEditBean.getCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel: {t("observe.catchLongline.count")}; @@ -142,7 +144,7 @@ } #totalWeight { - property:{CatchLongline.PROPERTY_TOTAL_WEIGHT}; + property:{CatchLonglineDto.PROPERTY_TOTAL_WEIGHT}; model:{tableEditBean.getTotalWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel: {t("observe.catchLongline.totalWeight")}; @@ -151,7 +153,7 @@ #hookWhenDiscarded { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.catchLongline.hookWhenDiscarded"; - _tablePropertyName:{CatchLongline.PROPERTY_HOOK_WHEN_DISCARDED}; + _tablePropertyName:{CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED}; selected:{BooleanUtils.isTrue(tableEditBean.getHookWhenDiscarded())}; } @@ -161,7 +163,7 @@ } #catchFateLongline { - property:{CatchLongline.PROPERTY_CATCH_FATE_LONGLINE}; + property:{CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE}; selectedItem:{tableEditBean.getCatchFateLongline()}; _validatorLabel: {t("observe.catchLongline.catchFateLongline")}; } @@ -172,7 +174,7 @@ } #catchHealthness { - property:{CatchLongline.PROPERTY_CATCH_HEALTHNESS}; + property:{CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS}; selectedItem:{tableEditBean.getCatchHealthness()}; _validatorLabel: {t("observe.catchLongline.catchHealthness")}; } @@ -183,7 +185,7 @@ } #discardHealthness { - property:{CatchLongline.PROPERTY_DISCARD_HEALTHNESS}; + property:{CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS}; selectedItem:{tableEditBean.getDiscardHealthness()}; _validatorLabel: {t("observe.catchLongline.discardHealthness")}; } @@ -194,7 +196,7 @@ } #catchFateLongline { - property:{CatchLongline.PROPERTY_CATCH_FATE_LONGLINE}; + property:{CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE}; selectedItem:{tableEditBean.getCatchFateLongline()}; _validatorLabel: {t("observe.catchLongline.catchFateLongline")}; } @@ -205,7 +207,7 @@ } #hookPosition { - property:{CatchLongline.PROPERTY_HOOK_POSITION}; + property:{CatchLonglineDto.PROPERTY_HOOK_POSITION}; selectedItem:{tableEditBean.getHookPosition()}; _validatorLabel: {t("observe.catchLongline.hookPosition")}; } @@ -215,7 +217,7 @@ } #comment2 { - _tablePropertyName: {CommentableEntity.PROPERTY_COMMENT}; + _tablePropertyName: {CommentableDto.PROPERTY_COMMENT}; text:{getStringValue(tableEditBean.getComment())}; } @@ -234,7 +236,7 @@ } #beatDiameter { - property:{CatchLongline.PROPERTY_BEAT_DIAMETER}; + property:{CatchLonglineDto.PROPERTY_BEAT_DIAMETER}; model:{tableEditBean.getBeatDiameter()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel: {t("observe.catchLongline.beatDiameter")}; @@ -243,7 +245,7 @@ #depredated { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.catchLongline.depredated"; - _tablePropertyName:{CatchLongline.PROPERTY_DEPREDATED}; + _tablePropertyName:{CatchLonglineDto.PROPERTY_DEPREDATED}; selected:{BooleanUtils.isTrue(tableEditBean.getDepredated())}; } @@ -252,8 +254,10 @@ } #predator { - property: predator; - selected:{tableEditBean.getPredator()}; + //FIXME + //property: predator; + //FIXME + //selected:{tableEditBean.getPredator()}; _validatorLabel: {t("observe.catchLongline.predator")}; showListLabel: true; universeLabel:{t("observe.catchLongline.availablePredator")}; @@ -279,7 +283,7 @@ } #sex { - property:{CatchLongline.PROPERTY_SEX}; + property:{CatchLonglineDto.PROPERTY_SEX}; selectedItem:{tableEditBean.getSex()}; _validatorLabel:{t("observe.catchLongline.sex")}; } @@ -290,7 +294,7 @@ } #stomacFullness { - property:{CatchLongline.PROPERTY_STOMAC_FULLNESS}; + property:{CatchLonglineDto.PROPERTY_STOMAC_FULLNESS}; selectedItem:{tableEditBean.getStomacFullness()}; _validatorLabel:{t("observe.catchLongline.stomacFullness")}; } @@ -301,7 +305,7 @@ } #maturityStatus { - property:{CatchLongline.PROPERTY_MATURITY_STATUS}; + property:{CatchLonglineDto.PROPERTY_MATURITY_STATUS}; selectedItem:{tableEditBean.getMaturityStatus()}; _validatorLabel:{t("observe.catchLongline.maturityStatus")}; } @@ -312,7 +316,7 @@ } #gonadeWeight { - property:{CatchLongline.PROPERTY_GONADE_WEIGHT}; + property:{CatchLonglineDto.PROPERTY_GONADE_WEIGHT}; model:{tableEditBean.getGonadeWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.catchLongline.gonadeWeight")}; @@ -363,7 +367,7 @@ #depthRecorder { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.depthRecorder"; - _branchlineBeanPropertyName:{Branchline.PROPERTY_DEPTH_RECORDER}; + _branchlineBeanPropertyName:{BranchlineDto.PROPERTY_DEPTH_RECORDER}; selected:{BooleanUtils.isTrue(branchlineBean.getDepthRecorder())}; _validatorLabel:{t("observe.branchline.depthRecorder")}; } @@ -371,7 +375,7 @@ #hookLost { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.hookLost"; - _branchlineBeanPropertyName:{Branchline.PROPERTY_HOOK_LOST}; + _branchlineBeanPropertyName:{BranchlineDto.PROPERTY_HOOK_LOST}; selected:{BooleanUtils.isTrue(branchlineBean.getHookLost())}; _validatorLabel:{t("observe.branchline.hookLost")}; } @@ -379,7 +383,7 @@ #traceCutOff { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.traceCutOff"; - _branchlineBeanPropertyName:{Branchline.PROPERTY_TRACE_CUT_OFF}; + _branchlineBeanPropertyName:{BranchlineDto.PROPERTY_TRACE_CUT_OFF}; selected:{BooleanUtils.isTrue(branchlineBean.getTraceCutOff())}; _validatorLabel:{t("observe.branchline.traceCutOff")}; } @@ -387,7 +391,7 @@ #timer { text:"observe.branchline.timer"; horizontalTextPosition:{JCheckBox.LEFT}; - _branchlineBeanPropertyName:{Branchline.PROPERTY_TIMER}; + _branchlineBeanPropertyName:{BranchlineDto.PROPERTY_TIMER}; selected:{BooleanUtils.isTrue(branchlineBean.getTimer())}; _validatorLabel:{t("observe.branchline.timer")}; } @@ -398,7 +402,7 @@ } #timeSinceContact { - property:{Branchline.PROPERTY_TIME_SINCE_CONTACT}; + property:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; bean:{branchlineBean}; enabled:{BooleanUtils.isTrue(branchlineBean.getTimer())}; model:{branchlineBean.getTimeSinceContact()}; @@ -413,9 +417,9 @@ #timerTimeOnBoard { date:{branchlineBean.getTimerTimeOnBoard()}; - propertyDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD}; - propertyDayDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; - propertyTimeDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; + propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; + //propertyDayDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; + //propertyTimeDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; bean:{branchlineBean}; enabled:{BooleanUtils.isTrue(branchlineBean.getTimer())}; label:{t("observe.branchline.timerTimeOnBoard")}; @@ -428,7 +432,7 @@ } #baitHaulingStatus { - property:{Branchline.PROPERTY_BAIT_HAULING_STATUS}; + property:{BranchlineDto.PROPERTY_BAIT_HAULING_STATUS}; bean:{branchlineBean}; selectedItem:{branchlineBean.getBaitHaulingStatus()}; _validatorLabel:{t("observe.branchline.baitHaulingStatus")}; 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 030d883..c5bb70e 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 @@ -30,10 +30,9 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto 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 @@ -80,7 +79,7 @@ <ContentTableModel id='tableModel'/> <!-- edit branchline --> - <BranchlineDto id='branchlineBean' initializer='new BranchlineImpl()'/> + <BranchlineDto id='branchlineBean' initializer='new BranchlineDto()'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' context='n1-update-catchLongline' @@ -269,7 +268,7 @@ <row> <cell columns="2" fill="both" weighty="0.7"> <JScrollPane id='predatorPane'> - <FilterableDoubleList id='predator' genericType='Species'/> + <FilterableDoubleList id='predator' genericType='SpeciesDto'/> </JScrollPane> </cell> </row> @@ -288,7 +287,7 @@ <JLabel id='stomacFullnessLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='stomacFullness' constructorParams='this' genericType='StomacFullness'/> + <BeanComboBox id='stomacFullness' constructorParams='this' genericType='StomacFullnessDto'/> </cell> </row> @@ -388,7 +387,7 @@ <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/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index c817dcc..8e74724 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 @@ -22,20 +22,27 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.business.util.TopiaExecutor; -import fr.ird.observe.business.util.TopiaExecutor2; -import fr.ird.observe.services.dto.longline.SizeMeasureDAODto; -import fr.ird.observe.services.dto.longline.WeightMeasureDAODto; +import fr.ird.observe.services.dto.ReferenceDto; +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.WeightMeasureDto; +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; @@ -49,10 +56,6 @@ import org.apache.commons.lang3.BooleanUtils; 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.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -77,7 +80,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, CatchLongline> { +public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineDto, CatchLonglineDto> { /** Logger */ static private Log log = LogFactory.getLog(CatchLonglineUIHandler.class); @@ -96,21 +99,21 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C private final PropertyChangeListener catchFateChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onCatchFateChanged((CatchFateLongline) evt.getNewValue(), (CatchLongline) evt.getSource()); + onCatchFateChanged((CatchFateLonglineDto) evt.getNewValue(), (CatchLonglineDto) evt.getSource()); } }; private final PropertyChangeListener branchlineChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onBranchlineChanged((Branchline) evt.getNewValue()); + onBranchlineChanged((BranchlineDto) evt.getNewValue()); } }; private final PropertyChangeListener depredatedChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onDepretadedChanged((Boolean) evt.getNewValue(), (CatchLongline) evt.getSource()); + onDepretadedChanged((Boolean) evt.getNewValue(), (CatchLonglineDto) evt.getSource()); } }; @@ -130,12 +133,15 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } }; - JAXXContextEntryDef<LonglinePositionHelper<CatchLongline>> POSITION_HELPER_ENTRY = - UIHelper.newContextEntryDef("CatchLonglineUI-positionHelper", LonglinePositionHelper.class); + //FIXME +// JAXXContextEntryDef<LonglinePositionHelper<CatchLonglineDto>> POSITION_HELPER_ENTRY = +// UIHelper.newContextEntryDef("CatchLonglineUI-positionHelper", LonglinePositionHelper.class); - private TopiaExecutor<? extends TopiaEntity> branchlineUpdator; + //FIXME +// private TopiaExecutor<? extends TopiaEntity> branchlineUpdator; - private TopiaExecutor2<TopiaEntity, Branchline> branchlineUpdateExecutor; + //FIXME +// private TopiaExecutor2<TopiaEntity, Branchline> branchlineUpdateExecutor; public CatchLonglineUIHandler(CatchLonglineUI ui) { super(ui, DataContextType.SetLongline); @@ -152,7 +158,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } @Override - protected void onSelectedRowChanged(int editingRow, CatchLongline bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, CatchLonglineDto bean, boolean create) { if (log.isInfoEnabled()) { log.info("Selected row changed: " + editingRow + ", create? " + create); @@ -171,7 +177,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C // load size measures SizeMeasuresTableModel sizeMeasuresTableModel = model.getSizeMeasuresTableModel(); - List<SizeMeasure> sizes = emptySelection ? Collections.<SizeMeasure>emptyList() : sizeMeasuresTableModel.getCacheForRow(editingRow); + List<SizeMeasureDto> sizes = emptySelection ? Collections.<SizeMeasureDto>emptyList() : sizeMeasuresTableModel.getCacheForRow(editingRow); if (sizes == null) { if (log.isInfoEnabled()) { @@ -192,16 +198,17 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } else { // updating mode: loading from db - try { - - sizes = getDataService().getCatchLonglineSizeMeasures(getDataSource(), bean, sizeMeasuresTableModel.getLoader()); - if (log.isInfoEnabled()) { - log.info("Loaded sizes (" + bean.getTopiaId() + "): " + sizes.size()); - } - - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load size measures", e); - } + //FIXME +// try { + +// sizes = getDataService().getCatchLonglineSizeMeasures(getDataSource(), bean, sizeMeasuresTableModel.getLoader()); +// if (log.isInfoEnabled()) { +// log.info("Loaded sizes (" + bean.getTopiaId() + "): " + sizes.size()); +// } +// +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load size measures", e); +// } } // init size measures @@ -219,7 +226,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C // load weight measures WeightMeasuresTableModel weightMeasuresTableModel = model.getWeightMeasuresTableModel(); - List<WeightMeasure> weights = emptySelection ? Collections.<WeightMeasure>emptyList() : weightMeasuresTableModel.getCacheForRow(editingRow); + List<WeightMeasureDto> weights = emptySelection ? Collections.<WeightMeasureDto>emptyList() : weightMeasuresTableModel.getCacheForRow(editingRow); if (weights == null) { @@ -231,16 +238,17 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } else { // updating mode: loading from db - try { - - weights = getDataService().getCatchLonglineWeightMeasures(getDataSource(), bean, weightMeasuresTableModel.getLoader()); - if (log.isInfoEnabled()) { - log.info("Loaded weights (" + bean.getTopiaId() + "): " + weights.size()); - } - - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load weight measures", e); - } + //FIXME +// try { +// +// weights = getDataService().getCatchLonglineWeightMeasures(getDataSource(), bean, weightMeasuresTableModel.getLoader()); +// if (log.isInfoEnabled()) { +// log.info("Loaded weights (" + bean.getTopiaId() + "): " + weights.size()); +// } +// +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load weight measures", e); +// } } @@ -301,17 +309,18 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - bean.removePropertyChangeListener(CatchLongline.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); - bean.addPropertyChangeListener(CatchLongline.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); + bean.removePropertyChangeListener(CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); + bean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); - bean.removePropertyChangeListener(CatchLongline.PROPERTY_BRANCHLINE, branchlineChanged); - bean.addPropertyChangeListener(CatchLongline.PROPERTY_BRANCHLINE, branchlineChanged); + bean.removePropertyChangeListener(CatchLonglineDto.PROPERTY_BRANCHLINE, branchlineChanged); + bean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_BRANCHLINE, branchlineChanged); - bean.removePropertyChangeListener(CatchLongline.PROPERTY_DEPREDATED, depredatedChanged); - bean.addPropertyChangeListener(CatchLongline.PROPERTY_DEPREDATED, depredatedChanged); + bean.removePropertyChangeListener(CatchLonglineDto.PROPERTY_DEPREDATED, depredatedChanged); + bean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_DEPREDATED, depredatedChanged); - LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); - positionHelper.resetPosition(bean); + //FIXME +// LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); +// positionHelper.resetPosition(bean); requestFocus.requestFocus(); @@ -351,16 +360,16 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C n("observe.catchlongline.table.comment"), n("observe.catchlongline.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Section.class, DecoratorService.HAULING_IDENTIFIER)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, Basket.class, DecoratorService.HAULING_IDENTIFIER)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, Branchline.class, DecoratorService.HAULING_IDENTIFIER)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SectionDto.class, DecoratorService.HAULING_IDENTIFIER)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, BasketDto.class, DecoratorService.HAULING_IDENTIFIER)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, BranchlineDto.class, DecoratorService.HAULING_IDENTIFIER)); - UIHelper.setTableColumnRenderer(table, 3, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 3, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEnumTableCellRenderer(renderer, CatchAcquisitionModeEnum.class)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 6, UIHelper.newDecorateTableCellRenderer(renderer, Healthness.class)); - UIHelper.setTableColumnRenderer(table, 7, UIHelper.newDecorateTableCellRenderer(renderer, CatchFateLongline.class)); - UIHelper.setTableColumnRenderer(table, 8, UIHelper.newDecorateTableCellRenderer(renderer, Healthness.class)); + UIHelper.setTableColumnRenderer(table, 6, UIHelper.newDecorateTableCellRenderer(renderer, HealthnessDto.class)); + UIHelper.setTableColumnRenderer(table, 7, UIHelper.newDecorateTableCellRenderer(renderer, CatchFateLonglineDto.class)); + UIHelper.setTableColumnRenderer(table, 8, UIHelper.newDecorateTableCellRenderer(renderer, HealthnessDto.class)); UIHelper.setTableColumnRenderer(table, 9, UIHelper.newBooleanTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 10, UIHelper.newStringTableCellRenderer(renderer, 10, true)); @@ -376,18 +385,19 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C n("observe.catchlongline.table.size"), n("observe.catchlongline.table.size.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SizeMeasureType.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SizeMeasureTypeDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - Decorator<SizeMeasureType> decorator = ObserveContext.get().getDecorator(SizeMeasureType.class); + Decorator<SizeMeasureTypeDto> decorator = ObserveContext.get().getDecorator(SizeMeasureTypeDto.class); - List<SizeMeasureType> list; - try { - list = getDataService().getList(getDataSource(), SizeMeasureType.class); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not get size measure types", e); - } - UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); + //FIXME +// List<SizeMeasureTypeDto> list; +// try { +// list = getDataService().getList(getDataSource(), SizeMeasureType.class); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not get size measure types", e); +// } +// UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); UIHelper.setTableColumnEditor(table, 1, ContentUIInitializer.newFloatColumnEditor(table)); SizeMeasuresTableModel tableModel = getModel().getSizeMeasuresTableModel(); @@ -406,18 +416,19 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C n("observe.catchlongline.table.weight"), n("observe.catchlongline.table.weight.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, WeightMeasureType.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, WeightMeasureTypeDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - Decorator<WeightMeasureType> decorator = ObserveContext.get().getDecorator(WeightMeasureType.class); + Decorator<WeightMeasureTypeDto> decorator = ObserveContext.get().getDecorator(WeightMeasureTypeDto.class); - List<WeightMeasureType> list; - try { - list = getDataService().getList(getDataSource(), WeightMeasureType.class); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not get size measure types", e); - } - UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); + //FIXME +// List<WeightMeasureType> list; +// try { +// list = getDataService().getList(getDataSource(), WeightMeasureType.class); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not get size measure types", e); +// } +// UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); UIHelper.setTableColumnEditor(table, 1, ContentUIInitializer.newFloatColumnEditor(table)); WeightMeasuresTableModel tableModel = getModel().getWeightMeasuresTableModel(); @@ -436,10 +447,11 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C }); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } @Override public void initUI() throws Exception { @@ -479,39 +491,41 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C setTableModelEditable(getModel().isEditable()); - LonglinePositionHelper<CatchLongline> positionHelper = new LonglinePositionHelper<CatchLongline>( - getUi().getSection(), - getUi().getBasket(), - getUi().getBranchline(), - getTableEditBean()); - - POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); + //FIXME +// LonglinePositionHelper<CatchLongline> positionHelper = new LonglinePositionHelper<CatchLongline>( +// getUi().getSection(), +// getUi().getBasket(), +// getUi().getBranchline(), +// getTableEditBean()); +// +// POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); } - @Override - protected SetLongline loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); - - // reset size measures - getModel().getSizeMeasuresTableModel().clear(); - - // reset weight measures - getModel().getWeightMeasuresTableModel().clear(); - - // load sections (and baskets and branchlines) - List<Section> sections = dataService.getSections(dataSource, setLongline.getTopiaId()); - - LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - positionHelper.initSections(sections, getTableModel().getData()); - - return setLongline; - - } + //FIXME +// @Override +// protected SetLongline loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); +// +// // reset size measures +// getModel().getSizeMeasuresTableModel().clear(); +// +// // reset weight measures +// getModel().getWeightMeasuresTableModel().clear(); +// +// // load sections (and baskets and branchlines) +// List<Section> sections = dataService.getSections(dataSource, setLongline.getTopiaId()); +// +// LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// positionHelper.initSections(sections, getTableModel().getData()); +// +// return setLongline; +// +// } @Override public void openUI() throws Exception { @@ -523,8 +537,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C super.openUI(); // Reset all sections - LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - getUi().getSection().setData(positionHelper.getSectionUniverse()); + //FIXME +// LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// getUi().getSection().setData(positionHelper.getSectionUniverse()); // To be sure always remove listener (could prevent some leaks) getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); @@ -549,102 +564,103 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - @Override - protected void onUpdateFinalize(TopiaContext tx, SetLongline bean, Collection<CatchLongline> oldChilds) throws TopiaException { - - List<CatchLongline> catchLonglines = bean.getCatchLongline(); - - // remove less precise position on longline - LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - positionHelper.savePosition(catchLonglines); - - CatchLonglineUIModel model = getModel(); - { - - // save sizes - - SizeMeasureDAO measureDao = ObserveDAOHelper.getSizeMeasureDAO(tx); - - SizeMeasuresTableModel sizeMeasuresTableModel = model.getSizeMeasuresTableModel(); - Set<Integer> rowsChanged = sizeMeasuresTableModel.getCacheRowsChanged(); - - TopiaEntityBinder<SizeMeasure> loader = sizeMeasuresTableModel.getLoader(); - for (Integer row : rowsChanged) { - - CatchLongline catchLongline = catchLonglines.get(row); - - List<SizeMeasure> measures = sizeMeasuresTableModel.getCacheForRow(row); - List<SizeMeasure> measuresToSave = new ArrayList<SizeMeasure>(measures.size()); - - for (SizeMeasure measure : measures) { - - if (sizeMeasuresTableModel.isRowNotEmpty(measure)) { - - SizeMeasure measureToSave; - - if (measure.getTopiaId() == null) { - measureToSave = measureDao.create(measure); - loader.load(measureToSave, measure, true); - } else { - measureToSave = catchLongline.getSizeMeasureByTopiaId(measure.getTopiaId()); - loader.load(measure, measureToSave, true); - } - - measuresToSave.add(measureToSave); - - } - - } - - catchLongline.clearSizeMeasure(); - catchLongline.addAllSizeMeasure(measuresToSave); - - } - - } - - { - - // save weights - - WeightMeasureDAO dao = ObserveDAOHelper.getWeightMeasureDAO(tx); - - WeightMeasuresTableModel weightMeasuresTableModel = model.getWeightMeasuresTableModel(); - TopiaEntityBinder<WeightMeasure> loader = weightMeasuresTableModel.getLoader(); - Set<Integer> rowsChanged = weightMeasuresTableModel.getCacheRowsChanged(); - - for (Integer row : rowsChanged) { - - CatchLongline catchLongline = catchLonglines.get(row); - - List<WeightMeasure> measures = weightMeasuresTableModel.getCacheForRow(row); - List<WeightMeasure> measuresToSave = new ArrayList<WeightMeasure>(measures.size()); - for (WeightMeasure measure : measures) { - - if (weightMeasuresTableModel.isRowNotEmpty(measure)) { - - WeightMeasure measureToSave; - - if (measure.getTopiaId() == null) { - measureToSave = dao.create(measure); - loader.load(measureToSave, measure, true); - } else { - measureToSave = catchLongline.getWeightMeasureByTopiaId(measure.getTopiaId()); - loader.load(measure, measureToSave, true); - } - measuresToSave.add(measureToSave); - - } - - } - - catchLongline.clearWeightMeasure(); - catchLongline.addAllWeightMeasure(measuresToSave); - } - - } - - } + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, SetLongline bean, Collection<CatchLongline> oldChilds) throws TopiaException { +// +// List<CatchLongline> catchLonglines = bean.getCatchLongline(); +// +// // remove less precise position on longline +// LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// positionHelper.savePosition(catchLonglines); +// +// CatchLonglineUIModel model = getModel(); +// { +// +// // save sizes +// +// SizeMeasureDAO measureDao = ObserveDAOHelper.getSizeMeasureDAO(tx); +// +// SizeMeasuresTableModel sizeMeasuresTableModel = model.getSizeMeasuresTableModel(); +// Set<Integer> rowsChanged = sizeMeasuresTableModel.getCacheRowsChanged(); +// +// TopiaEntityBinder<SizeMeasure> loader = sizeMeasuresTableModel.getLoader(); +// for (Integer row : rowsChanged) { +// +// CatchLongline catchLongline = catchLonglines.get(row); +// +// List<SizeMeasure> measures = sizeMeasuresTableModel.getCacheForRow(row); +// List<SizeMeasure> measuresToSave = new ArrayList<SizeMeasure>(measures.size()); +// +// for (SizeMeasure measure : measures) { +// +// if (sizeMeasuresTableModel.isRowNotEmpty(measure)) { +// +// SizeMeasure measureToSave; +// +// if (measure.getTopiaId() == null) { +// measureToSave = measureDao.create(measure); +// loader.load(measureToSave, measure, true); +// } else { +// measureToSave = catchLongline.getSizeMeasureByTopiaId(measure.getTopiaId()); +// loader.load(measure, measureToSave, true); +// } +// +// measuresToSave.add(measureToSave); +// +// } +// +// } +// +// catchLongline.clearSizeMeasure(); +// catchLongline.addAllSizeMeasure(measuresToSave); +// +// } +// +// } +// +// { +// +// // save weights +// +// WeightMeasureDAO dao = ObserveDAOHelper.getWeightMeasureDAO(tx); +// +// WeightMeasuresTableModel weightMeasuresTableModel = model.getWeightMeasuresTableModel(); +// TopiaEntityBinder<WeightMeasure> loader = weightMeasuresTableModel.getLoader(); +// Set<Integer> rowsChanged = weightMeasuresTableModel.getCacheRowsChanged(); +// +// for (Integer row : rowsChanged) { +// +// CatchLongline catchLongline = catchLonglines.get(row); +// +// List<WeightMeasure> measures = weightMeasuresTableModel.getCacheForRow(row); +// List<WeightMeasure> measuresToSave = new ArrayList<WeightMeasure>(measures.size()); +// for (WeightMeasure measure : measures) { +// +// if (weightMeasuresTableModel.isRowNotEmpty(measure)) { +// +// WeightMeasure measureToSave; +// +// if (measure.getTopiaId() == null) { +// measureToSave = dao.create(measure); +// loader.load(measureToSave, measure, true); +// } else { +// measureToSave = catchLongline.getWeightMeasureByTopiaId(measure.getTopiaId()); +// loader.load(measure, measureToSave, true); +// } +// measuresToSave.add(measureToSave); +// +// } +// +// } +// +// catchLongline.clearWeightMeasure(); +// catchLongline.addAllWeightMeasure(measuresToSave); +// } +// +// } +// +// } @Override protected void resetEditBean() { @@ -656,14 +672,16 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C super.resetEditBean(); - onBranchlineChanged(getTableEditBean().getBranchline()); + //FIXME +// onBranchlineChanged(getTableEditBean().getBranchline()); } public void resetBranchline() { onBranchlineChanged(null); - onBranchlineChanged(getTableEditBean().getBranchline()); + //FIXME +// onBranchlineChanged(getTableEditBean().getBranchline()); } @@ -673,16 +691,17 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C log.info("Saved modified branchline"); } - try { +// try { - Branchline branchline = getTableEditBean().getBranchline(); - Branchline beanSaved = getDataService().update(getDataSource(), null, branchline, getBranchlineUpdateExecutor()); - getTableEditBean().setBranchline(beanSaved); + ReferenceDto<BranchlineDto> branchline = getTableEditBean().getBranchline(); + //FIXME +// BranchlineDto beanSaved = getDataService().update(getDataSource(), null, branchline, getBranchlineUpdateExecutor()); +// getTableEditBean().setBranchline(beanSaved); getUi().getBranchlineValidator().setChanged(false); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not save branchline", e); - } +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not save branchline", e); +// } @@ -703,7 +722,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C boolean createMode = ui.getTableModel().isCreate(); - CatchLongline editBean = ui.getTableEditBean(); + CatchLonglineDto editBean = ui.getTableEditBean(); switch (newMode) { @@ -798,11 +817,11 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - protected void onCatchFateChanged(CatchFateLongline newValue, CatchLongline tableEditBean) { + protected void onCatchFateChanged(CatchFateLonglineDto newValue, CatchLonglineDto tableEditBean) { CatchLonglineUI ui = getUi(); - if (newValue == null || !"fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.3".equals(newValue.getTopiaId())) { + if (newValue == null || !"fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { // not discarded ui.getDiscardHealthness().setEnabled(false); @@ -821,13 +840,13 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - protected void onBranchlineChanged(Branchline newValue) { + protected void onBranchlineChanged(BranchlineDto newValue) { CatchLonglineUI ui = getUi(); - Branchline branchline = ui.getBranchlineBean(); + BranchlineDto branchline = ui.getBranchlineBean(); - SwingValidator<Branchline> branchlineValidator = ui.getBranchlineValidator(); + SwingValidator<BranchlineDto> branchlineValidator = ui.getBranchlineValidator(); if (newValue == null) { if (log.isInfoEnabled()) { @@ -844,11 +863,12 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C branchlineValidator.setBean(branchline); - try { - getDataService().loadEditEntity(getDataSource(), newValue.getTopiaId(), getBranchlineUpdator()); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load branchline", e); - } + //FIXME +// try { +// getDataService().loadEditEntity(getDataSource(), newValue.getTopiaId(), getBranchlineUpdator()); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load branchline", e); +// } } @@ -856,7 +876,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - protected void onDepretadedChanged(Boolean newValue, CatchLongline tableEditBean) { + protected void onDepretadedChanged(Boolean newValue, CatchLonglineDto tableEditBean) { CatchLonglineUI ui = getUi(); @@ -939,41 +959,43 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C return (CatchLonglineTableModel) super.getTableModel(); } - protected TopiaExecutor<? extends TopiaEntity> getBranchlineUpdator() { - if (branchlineUpdator == null) { - branchlineUpdator = new TopiaExecutor<Branchline>() { - - private final TopiaEntityBinder<Branchline> branchlineLoador = getModel().getBranchlineLoador(); - - @Override - public void execute(TopiaContext tx, Branchline newValue) throws TopiaException { - - Branchline editBean = getUi().getBranchlineBean(); - branchlineLoador.load(newValue, editBean, false); - - } - }; - } - return branchlineUpdator; - } - - protected TopiaExecutor2<TopiaEntity, Branchline> getBranchlineUpdateExecutor() { - if (branchlineUpdateExecutor == null) { - branchlineUpdateExecutor = new TopiaExecutor2<TopiaEntity, Branchline>() { - - private final TopiaEntityBinder<Branchline> branchlineLoador = getModel().getBranchlineLoador(); - - @Override - public Branchline execute(TopiaContext tx, TopiaEntity parentBean, Branchline beanToSave) throws TopiaException { - - Branchline editBean = getUi().getBranchlineBean(); - branchlineLoador.load(editBean, beanToSave, false); - return beanToSave; - - } - }; - } - return branchlineUpdateExecutor; - } + //FIXME +// protected TopiaExecutor<? extends TopiaEntity> getBranchlineUpdator() { +// if (branchlineUpdator == null) { +// branchlineUpdator = new TopiaExecutor<Branchline>() { +// +// private final TopiaEntityBinder<Branchline> branchlineLoador = getModel().getBranchlineLoador(); +// +// @Override +// public void execute(TopiaContext tx, Branchline newValue) throws TopiaException { +// +// Branchline editBean = getUi().getBranchlineBean(); +// branchlineLoador.load(newValue, editBean, false); +// +// } +// }; +// } +// return branchlineUpdator; +// } + + //FIXME +// protected TopiaExecutor2<TopiaEntity, Branchline> getBranchlineUpdateExecutor() { +// if (branchlineUpdateExecutor == null) { +// branchlineUpdateExecutor = new TopiaExecutor2<TopiaEntity, Branchline>() { +// +// private final TopiaEntityBinder<Branchline> branchlineLoador = getModel().getBranchlineLoador(); +// +// @Override +// public Branchline execute(TopiaContext tx, TopiaEntity parentBean, Branchline beanToSave) throws TopiaException { +// +// Branchline editBean = getUi().getBranchlineBean(); +// branchlineLoador.load(editBean, beanToSave, false); +// return beanToSave; +// +// } +// }; +// } +// return branchlineUpdateExecutor; +// } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css index 6066c5b..40f6769 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css @@ -26,7 +26,7 @@ } #encounterType { - property:{Encounter.PROPERTY_ENCOUNTER_TYPE}; + property:{EncounterDto.PROPERTY_ENCOUNTER_TYPE}; selectedItem:{tableEditBean.getEncounterType()}; } @@ -36,7 +36,7 @@ } #species { - property:{Encounter.PROPERTY_SPECIES}; + property:{EncounterDto.PROPERTY_SPECIES}; selectedItem:{tableEditBean.getSpecies()}; } @@ -46,7 +46,7 @@ } #count { - property:{Encounter.PROPERTY_COUNT}; + property:{EncounterDto.PROPERTY_COUNT}; model:{tableEditBean.getCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -57,7 +57,7 @@ } #distance { - property:{Encounter.PROPERTY_DISTANCE}; + property:{EncounterDto.PROPERTY_DISTANCE}; model:{tableEditBean.getDistance()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; } 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 d5c7342..71bf620 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 @@ -31,7 +31,7 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.ActivityLonglineDto fr.ird.observe.services.dto.longline.EncounterDto fr.ird.observe.services.dto.referential.SpeciesDto 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 502bff4..7dc101d 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 @@ -22,11 +22,14 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +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; @@ -43,7 +46,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class EncounterUIHandler extends ContentTableUIHandler<ActivityLongline, Encounter> { +public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineDto, EncounterDto> { /** Logger */ static private Log log = LogFactory.getLog(EncounterUIHandler.class); @@ -58,7 +61,7 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLongline, } @Override - protected void onSelectedRowChanged(int editingRow, Encounter bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, EncounterDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); @@ -81,16 +84,17 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLongline, n("observe.encounter.table.count"), n("observe.encounter.table.count.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, EncounterType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, EncounterTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedActivityId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedActivityId(); +// } @Override public void initUI() throws Exception { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css index 6afb134..b6ac1f6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css @@ -26,7 +26,7 @@ } #lineType { - property:{FloatlinesComposition.PROPERTY_LINE_TYPE}; + property:{FloatlinesCompositionDto.PROPERTY_LINE_TYPE}; selectedItem:{tableEditBean.getLineType()}; _validatorLabel:{t("observe.floatlinesComposition.lineType")}; } @@ -37,7 +37,7 @@ } #length { - property:{FloatlinesComposition.PROPERTY_LENGTH}; + property:{FloatlinesCompositionDto.PROPERTY_LENGTH}; model:{tableEditBean.getLength()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.floatlinesComposition.length")}; @@ -49,7 +49,7 @@ } #proportion { - property:{FloatlinesComposition.PROPERTY_PROPORTION}; + property:{FloatlinesCompositionDto.PROPERTY_PROPORTION}; model:{tableEditBean.getProportion()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.floatlinesComposition.proportion")}; @@ -61,7 +61,7 @@ } #floatlinesCompositionProportionSum { - text:{getStringValue(bean.getFloatlinesCompositionProportionSum())}; + //text:{getStringValue(bean.getFloatlinesCompositionProportionSum())}; _validatorLabel:{t("observe.floatlinesComposition.proportionSum")}; font-weight:bold; } 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 e068151..fd9cb6b 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 @@ -62,8 +62,9 @@ <BeanValidator id='validator' context='n1-update-floatlinesComposition' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> - <field name="floatlinesCompositionProportionSum" component="floatlinesCompositionProportionSum"/> - <field name="floatlinesComposition" component="editorPanel"/> + <!--FIXME--> + <!--<field name="floatlinesCompositionProportionSum" component="floatlinesCompositionProportionSum"/>--> + <!--<field name="floatlinesComposition" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> 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 3e6cf7c..30521a6 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 @@ -22,16 +22,16 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +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; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -46,7 +46,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLongline, FloatlinesComposition> { +public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, FloatlinesCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(FloatlinesCompositionUIHandler.class); @@ -61,7 +61,7 @@ public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLon } @Override - protected void onSelectedRowChanged(int editingRow, FloatlinesComposition bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, FloatlinesCompositionDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -86,31 +86,34 @@ public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLon n("observe.floatlinesComposition.table.proportion"), n("observe.floatlinesComposition.table.proportion.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, LineType.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, LineTypeDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); // when model change in table, let's recompute the proportion sum - table.getModel().addTableModelListener(new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - - int proportionSum = getBean().getFloatlinesCompositionProportionSum(); - getBean().setFloatlinesCompositionProportionSum(proportionSum); - } - }); + //FIXME +// table.getModel().addTableModelListener(new TableModelListener() { +// @Override +// public void tableChanged(TableModelEvent e) { +// +// int proportionSum = getBean().getFloatlinesCompositionProportionSum(); +// getBean().setFloatlinesCompositionProportionSum(proportionSum); +// } +// }); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } - - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { +// return super.onUpdate(tx, parentBean, beanToSave); +// } @Override public void afterSave(boolean refresh) { 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 10209bc..01ec2ce 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,16 +22,14 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -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.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; -import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesMeasurementLonglinesTableModel; -import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesLonglineUIHandler; -import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesLonglineUIModel; import org.apache.commons.collections4.CollectionUtils; import java.util.List; @@ -85,13 +83,13 @@ public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLon GearUseFeaturesLonglineDto rowBean = getRowBean(); GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - if (rowBean.getTopiaId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { + if (rowBean.getId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { // new gear usage, add default measurements - Gear gear = rowBean.getGear(); - List<GearUseFeaturesMeasurementLongline> measurements = - gearUseFeaturesLonglineUIHandler.getDefaultGearUseFeaturesMeasurementLongline(gear.getTopiaId()); + ReferentialReferenceDto<GearDto> gear = rowBean.getGear(); + List<GearUseFeaturesMeasurementLonglineDto> measurements = + gearUseFeaturesLonglineUIHandler.getDefaultGearUseFeaturesMeasurementLongline(gear.getId()); 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/longline/GearUseFeaturesLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css index 6b55ed7..52e9d84 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css @@ -41,7 +41,7 @@ } #gear { - property:{GearUseFeaturesLongline.PROPERTY_GEAR}; + property:{GearUseFeaturesLonglineDto.PROPERTY_GEAR}; selectedItem:{tableEditBean.getGear()}; } @@ -51,7 +51,7 @@ } #number { - property:{GearUseFeaturesLongline.PROPERTY_NUMBER}; + property:{GearUseFeaturesLonglineDto.PROPERTY_NUMBER}; model:{tableEditBean.getNumber()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -63,7 +63,7 @@ #usedInTrip { booleanValue:{tableEditBean.getUsedInTrip()}; - _tablePropertyName:{GearUseFeaturesLongline.PROPERTY_USED_IN_TRIP}; + _tablePropertyName:{GearUseFeaturesLonglineDto.PROPERTY_USED_IN_TRIP}; } /* ***************************************************************************** */ @@ -85,10 +85,11 @@ minimumSize:{new Dimension(10,80)}; } -#comment2 { - _tablePropertyName: {GearUseFeaturesLongline.PROPERTY_COMMENT}; - text:{getStringValue(tableEditBean.getComment())}; -} +//#comment2 { + //FIXME + //_tablePropertyName: {GearUseFeaturesLonglineDto.PROPERTY_COMMENT}; + //text:{getStringValue(tableEditBean.getComment())}; +//} #deleteSelectedMeasurement { text: "observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement"; 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 d008d6d..1de6a18 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 @@ -29,11 +29,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto 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 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 6b1e490..bf68ba1 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 @@ -22,15 +22,17 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDAODto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -46,9 +48,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; 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.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -81,7 +80,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<TripLongline, GearUseFeaturesLongline> { +public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<TripLonglineDto, GearUseFeaturesLonglineDto> { /** Logger */ static private Log log = LogFactory.getLog(GearUseFeaturesLonglineUIHandler.class); @@ -120,7 +119,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } @Override - protected void onSelectedRowChanged(int editingRow, GearUseFeaturesLongline bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, GearUseFeaturesLonglineDto bean, boolean create) { if (log.isInfoEnabled()) { log.info("Selected row changed: " + editingRow + ", create? " + create); @@ -138,7 +137,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip // load size measures GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - List<GearUseFeaturesMeasurementLongline> measurements = emptySelection ? Collections.<GearUseFeaturesMeasurementLongline>emptyList() : measurementsTableModel.getCacheForRow(editingRow); + List<GearUseFeaturesMeasurementLonglineDto> measurements = emptySelection ? Collections.<GearUseFeaturesMeasurementLonglineDto>emptyList() : measurementsTableModel.getCacheForRow(editingRow); if (measurements == null) { if (log.isInfoEnabled()) { @@ -159,16 +158,17 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } else { // updating mode: loading from db - try { - - measurements = getDataService().getGearUseFeaturesMeasurementLongline(getDataSource(), bean, measurementsTableModel.getLoader()); - if (log.isInfoEnabled()) { - log.info("Loaded measurements (" + bean.getTopiaId() + "): " + measurements.size()); - } - - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load measurements", e); - } + //FIXME +// try { +// +// measurements = getDataService().getGearUseFeaturesMeasurementLongline(getDataSource(), bean, measurementsTableModel.getLoader()); +// if (log.isInfoEnabled()) { +// log.info("Loaded measurements (" + bean.getTopiaId() + "): " + measurements.size()); +// } +// +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load measurements", e); +// } } // init measurements @@ -225,7 +225,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip n("observe.gearUseFeaturesLongline.table.comment"), n("observe.gearUseFeaturesLongline.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Gear.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newBooleanTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); @@ -241,20 +241,21 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip n("observe.gearUseFeaturesLongline.table.value"), n("observe.gearUseFeaturesLongline.table.value.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearCaracteristic.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearCaracteristicDto.class)); UIHelper.setTableColumnRenderer(table, 1, new GearUseFeatureMeasurementCellRenderer(0, renderer)); table.getTableHeader().setReorderingAllowed(false); - Decorator<GearCaracteristic> decorator = ObserveContext.get().getDecorator(GearCaracteristic.class); + Decorator<GearCaracteristicDto> decorator = ObserveContext.get().getDecorator(GearCaracteristicDto.class); - List<GearCaracteristic> list; - try { - list = getDataService().getList(getDataSource(), GearCaracteristic.class); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not get gear caracteristics", e); - } - UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); + //FIXME +// List<GearCaracteristic> list; +// try { +// list = getDataService().getList(getDataSource(), GearCaracteristic.class); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not get gear caracteristics", e); +// } +// UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); GearUseFeaturesMeasurementLonglinesTableModel tableModel = getModel().getMeasurementsTableModel(); @@ -279,10 +280,11 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedTripLonglineId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedTripLonglineId(); +// } @Override public void initUI() throws Exception { @@ -303,17 +305,18 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } - @Override - protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { - - TripLongline tripLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); - - // reset measurements - getModel().getMeasurementsTableModel().clear(); - - return tripLongline; - - } + //FIXME +// @Override +// protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// TripLongline tripLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); +// +// // reset measurements +// getModel().getMeasurementsTableModel().clear(); +// +// return tripLongline; +// +// } @Override public void openUI() throws Exception { @@ -364,7 +367,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip if (!selectionEmpty) { - GearUseFeaturesMeasurementLongline data = tableModel.getSelectedRow(); + GearUseFeaturesMeasurementLonglineDto data = tableModel.getSelectedRow(); if (log.isInfoEnabled()) { log.info("Delete: " + data); @@ -391,62 +394,64 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } - @Override - protected TripLongline onCreate(TopiaContext tx, Object parentBean, TripLongline editBean) throws TopiaException { - return super.onCreate(tx, parentBean, editBean); - } - - @Override - protected void onUpdateFinalize(TopiaContext tx, TripLongline bean, Collection<GearUseFeaturesLongline> oldChilds) throws TopiaException { - - List<GearUseFeaturesLongline> gearUseFeatures = bean.getGearUseFeaturesLongline(); - - GearUseFeaturesLonglineUIModel model = getModel(); - { - - // save measurments - - GearUseFeaturesMeasurementLonglineDAO measureDao = ObserveDAOHelper.getGearUseFeaturesMeasurementLonglineDAO(tx); - - GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - Set<Integer> rowsChanged = measurementsTableModel.getCacheRowsChanged(); - - TopiaEntityBinder<GearUseFeaturesMeasurementLongline> loader = measurementsTableModel.getLoader(); - for (Integer row : rowsChanged) { - - GearUseFeaturesLongline gearUseFeaturesLongline = gearUseFeatures.get(row); - - List<GearUseFeaturesMeasurementLongline> measurements = measurementsTableModel.getCacheForRow(row); - List<GearUseFeaturesMeasurementLongline> measurementsToSave = new ArrayList<GearUseFeaturesMeasurementLongline>(measurements.size()); - - for (GearUseFeaturesMeasurementLongline measure : measurements) { - - if (measurementsTableModel.isRowNotEmpty(measure)) { - - GearUseFeaturesMeasurementLongline measureToSave; - - if (measure.getTopiaId() == null) { - measureToSave = measureDao.create(measure); - loader.load(measureToSave, measure, true); - } else { - measureToSave = gearUseFeaturesLongline.getGearUseFeaturesMeasurementByTopiaId(measure.getTopiaId()); - loader.load(measure, measureToSave, true); - } - - measurementsToSave.add(measureToSave); - - } - - } - - gearUseFeaturesLongline.clearGearUseFeaturesMeasurement(); - gearUseFeaturesLongline.addAllGearUseFeaturesMeasurement(measurementsToSave); - - } - - } - - } + //FIXME +// @Override +// protected TripLongline onCreate(TopiaContext tx, Object parentBean, TripLongline editBean) throws TopiaException { +// return super.onCreate(tx, parentBean, editBean); +// } + + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, TripLongline bean, Collection<GearUseFeaturesLongline> oldChilds) throws TopiaException { +// +// List<GearUseFeaturesLongline> gearUseFeatures = bean.getGearUseFeaturesLongline(); +// +// GearUseFeaturesLonglineUIModel model = getModel(); +// { +// +// // save measurments +// +// GearUseFeaturesMeasurementLonglineDAO measureDao = ObserveDAOHelper.getGearUseFeaturesMeasurementLonglineDAO(tx); +// +// GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); +// Set<Integer> rowsChanged = measurementsTableModel.getCacheRowsChanged(); +// +// TopiaEntityBinder<GearUseFeaturesMeasurementLongline> loader = measurementsTableModel.getLoader(); +// for (Integer row : rowsChanged) { +// +// GearUseFeaturesLongline gearUseFeaturesLongline = gearUseFeatures.get(row); +// +// List<GearUseFeaturesMeasurementLongline> measurements = measurementsTableModel.getCacheForRow(row); +// List<GearUseFeaturesMeasurementLongline> measurementsToSave = new ArrayList<GearUseFeaturesMeasurementLongline>(measurements.size()); +// +// for (GearUseFeaturesMeasurementLongline measure : measurements) { +// +// if (measurementsTableModel.isRowNotEmpty(measure)) { +// +// GearUseFeaturesMeasurementLongline measureToSave; +// +// if (measure.getTopiaId() == null) { +// measureToSave = measureDao.create(measure); +// loader.load(measureToSave, measure, true); +// } else { +// measureToSave = gearUseFeaturesLongline.getGearUseFeaturesMeasurementByTopiaId(measure.getTopiaId()); +// loader.load(measure, measureToSave, true); +// } +// +// measurementsToSave.add(measureToSave); +// +// } +// +// } +// +// gearUseFeaturesLongline.clearGearUseFeaturesMeasurement(); +// gearUseFeaturesLongline.addAllGearUseFeaturesMeasurement(measurementsToSave); +// +// } +// +// } +// +// } @Override protected void resetEditBean() { @@ -533,17 +538,19 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } - public List<GearUseFeaturesMeasurementLongline> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { - - try { - List<GearUseFeaturesMeasurementLongline> measurements = getDataService().getDefaultGearUseFeaturesMeasurementLongline(getDataSource(), gearId); - if (log.isInfoEnabled()) { - log.info("Create mode, use default measurements: " + measurements.size()); - } - return measurements; - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not create default measurements", e); - } + public List<GearUseFeaturesMeasurementLonglineDto> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { + + //FIXME +// try { +// List<GearUseFeaturesMeasurementLongline> measurements = getDataService().getDefaultGearUseFeaturesMeasurementLongline(getDataSource(), gearId); +// if (log.isInfoEnabled()) { +// log.info("Create mode, use default measurements: " + measurements.size()); +// } +// return measurements; +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not create default measurements", e); +// } + return null; } 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 0593604..e8c9c12 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 @@ -24,7 +24,6 @@ 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.ObserveServiceHelper; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; @@ -58,8 +57,7 @@ public class GearUseFeaturesLonglineUIModel extends ContentTableUIModel<TripLong protected boolean generalTabValid; - //FIXME -// private final GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel; + private final GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel; public GearUseFeaturesLonglineUIModel(GearUseFeaturesLonglineUI ui) { @@ -95,7 +93,7 @@ public class GearUseFeaturesLonglineUIModel extends ContentTableUIModel<TripLong // // } // -// this.measurementsTableModel = new GearUseFeaturesMeasurementLonglinesTableModel(binder); + this.measurementsTableModel = new GearUseFeaturesMeasurementLonglinesTableModel(); List<ContentTableMeta<GearUseFeaturesLonglineDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(GearUseFeaturesLonglineDto.class, GearUseFeaturesLonglineDto.PROPERTY_GEAR, false), 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 a5b98ae..1a34c4c 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,11 +22,8 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -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; /** * Created on 4/7/15. @@ -34,21 +31,21 @@ import org.nuiton.topia.persistence.util.TopiaEntityBinder; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTableWithCacheTableModelSupport<GearUseFeaturesMeasurementLongline> { +public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTableWithCacheTableModelSupport<GearUseFeaturesMeasurementLonglineDto> { private static final long serialVersionUID = 1L; - public GearUseFeaturesMeasurementLonglinesTableModel(TopiaEntityBinder<GearUseFeaturesMeasurementLongline> topiaBinder) { - super(topiaBinder); + public GearUseFeaturesMeasurementLonglinesTableModel() { + super(); } @Override - public boolean isRowNotEmpty(GearUseFeaturesMeasurementLongline valid) { + public boolean isRowNotEmpty(GearUseFeaturesMeasurementLonglineDto valid) { return !(valid.getGearCaracteristic() == null && valid.getMeasurementValue() == null); } @Override - protected boolean isRowValid(GearUseFeaturesMeasurementLongline valid) { + protected boolean isRowValid(GearUseFeaturesMeasurementLonglineDto valid) { String size = valid.getMeasurementValue(); return !(valid.getGearCaracteristic() == null || size == null) && !size.isEmpty(); } @@ -61,7 +58,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable @Override public Object getValueAt(int rowIndex, int columnIndex) { - GearUseFeaturesMeasurementLongline measure = data.get(rowIndex); + GearUseFeaturesMeasurementLonglineDto measure = data.get(rowIndex); Object result; switch (columnIndex) { case 0: @@ -85,7 +82,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable result = true; break; case 1: - GearUseFeaturesMeasurementLongline measure = data.get(rowIndex); + GearUseFeaturesMeasurementLonglineDto measure = data.get(rowIndex); result = measure != null && measure.getGearCaracteristic() != null; break; default: @@ -98,11 +95,12 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - GearUseFeaturesMeasurementLongline measure = data.get(rowIndex); + GearUseFeaturesMeasurementLonglineDto measure = data.get(rowIndex); switch (columnIndex) { case 0: - measure.setGearCaracteristic((GearCaracteristic) aValue); + //FIXME +// measure.setGearCaracteristic((GearCaracteristicDto) aValue); break; case 1: @@ -129,7 +127,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable } @Override - protected GearUseFeaturesMeasurementLongline createNewRow() { - return new GearUseFeaturesMeasurementLonglineImpl(); + protected GearUseFeaturesMeasurementLonglineDto createNewRow() { + return new GearUseFeaturesMeasurementLonglineDto(); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css index f544615..29e05a6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css @@ -26,7 +26,7 @@ } #hookType { - property:{HooksComposition.PROPERTY_HOOK_TYPE}; + property:{HooksCompositionDto.PROPERTY_HOOK_TYPE}; selectedItem:{tableEditBean.getHookType()}; _validatorLabel:{t("observe.hooksComposition.hookType")}; } @@ -37,7 +37,7 @@ } #hookSize { - property:{HooksComposition.PROPERTY_HOOK_SIZE}; + property:{HooksCompositionDto.PROPERTY_HOOK_SIZE}; selectedItem:{tableEditBean.getHookSize()}; _validatorLabel:{t("observe.hooksComposition.hookSize")}; } @@ -49,7 +49,7 @@ } #hookOffset { - property:{HooksComposition.PROPERTY_HOOK_OFFSET}; + property:{HooksCompositionDto.PROPERTY_HOOK_OFFSET}; model:{tableEditBean.getHookOffset()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.hooksComposition.hookOffset")}; @@ -61,7 +61,7 @@ } #proportion { - property:{HooksComposition.PROPERTY_PROPORTION}; + property:{HooksCompositionDto.PROPERTY_PROPORTION}; model:{tableEditBean.getProportion()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.hooksComposition.proportion")}; @@ -73,7 +73,8 @@ } #hooksCompositionProportionSum { - text:{getStringValue(bean.getHooksCompositionProportionSum())}; + //FIXME + //text:{getStringValue(bean.getHooksCompositionProportionSum())}; _validatorLabel:{t("observe.hooksComposition.proportionSum")}; font-weight:bold; } 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 cf97d4f..a9dcbbb 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 @@ -63,7 +63,8 @@ <BeanValidator id='validator' autoField='true' context='n1-update-hooksComposition' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> - <field name="hooksComposition" component="editorPanel"/> + <!--FIXME--> + <!--<field name="hooksComposition" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> 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 23ea26d..a04f806 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 @@ -22,16 +22,17 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +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; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -46,7 +47,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline, HooksComposition> { +public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, HooksCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(HooksCompositionUIHandler.class); @@ -61,7 +62,7 @@ public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline } @Override - protected void onSelectedRowChanged(int editingRow, HooksComposition bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, HooksCompositionDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -88,31 +89,34 @@ public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline n("observe.hooksComposition.table.proportion"), n("observe.hooksComposition.table.proportion.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, HookType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, HookSize.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, HookTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, HookSizeDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); // when model change in table, let's recompute the proportion sum - table.getModel().addTableModelListener(new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - int proportionSum = getBean().getHooksCompositionProportionSum(); - getBean().setHooksCompositionProportionSum(proportionSum); - } - }); - - } + //FIXME +// table.getModel().addTableModelListener(new TableModelListener() { +// @Override +// public void tableChanged(TableModelEvent e) { +// int proportionSum = getBean().getHooksCompositionProportionSum(); +// getBean().setHooksCompositionProportionSum(proportionSum); +// } +// }); - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); } - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { +// return super.onUpdate(tx, parentBean, beanToSave); +// } @Override public void afterSave(boolean refresh) { 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 3fac437..760eed2 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,22 +22,19 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.business.LonglinePositionAware; 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; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; /** * Created on 1/6/15. @@ -47,22 +44,22 @@ import java.util.Map; */ public class LonglinePositionHelper<E extends LonglinePositionAware> { - final BeanComboBox<Section> uiSection; + final BeanComboBox<SectionDto> uiSection; - final BeanComboBox<Basket> uiBasket; + final BeanComboBox<BasketDto> uiBasket; - final BeanComboBox<Branchline> uiBranchline; + final BeanComboBox<BranchlineDto> uiBranchline; // To avoid any propagation when doing some works on locations protected boolean locationIsAdjusting; - List<Section> sectionUniverse; + List<SectionDto> sectionUniverse; - List<Basket> basketUniverse; + List<BasketDto> basketUniverse; - public LonglinePositionHelper(BeanComboBox<Section> uiSection, - BeanComboBox<Basket> uiBasket, - BeanComboBox<Branchline> uiBranchline, + public LonglinePositionHelper(BeanComboBox<SectionDto> uiSection, + BeanComboBox<BasketDto> uiBasket, + BeanComboBox<BranchlineDto> uiBranchline, E tableEditBean) { this.uiSection = uiSection; @@ -72,31 +69,32 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { PropertyChangeListener sectionChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onSectionChanged((Section) evt.getNewValue(), (E) evt.getSource()); + onSectionChanged((SectionDto) evt.getNewValue(), (E) evt.getSource()); } }; - tableEditBean.addPropertyChangeListener(CatchLongline.PROPERTY_SECTION, sectionChanged); + tableEditBean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_SECTION, sectionChanged); PropertyChangeListener basketChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onBasketChanged((Basket) evt.getNewValue(), (E) evt.getSource()); + onBasketChanged((BasketDto) evt.getNewValue(), (E) evt.getSource()); } }; - tableEditBean.addPropertyChangeListener(CatchLongline.PROPERTY_BASKET, basketChanged); + tableEditBean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_BASKET, basketChanged); } - public void initSections(List<Section> sections, List<E> entities) { + public void initSections(List<SectionDto> sections, List<E> entities) { this.sectionUniverse = sections; - this.basketUniverse = Baskets.getBaskets(sections); - - List<Branchline> branchlineUniverse = Branchlines.getBranchlines(basketUniverse); - - Map<String, Section> sectionsById = Entities.toIdMap(sectionUniverse); - Map<String, Basket> basketsById = Entities.toIdMap(basketUniverse); - Map<String, Branchline> branchlinesById = Entities.toIdMap(branchlineUniverse); +//FIXME +// this.basketUniverse = Baskets.getBaskets(sections); +// +// List<Branchline> branchlineUniverse = Branchlines.getBranchlines(basketUniverse); +// +// Map<String, Section> sectionsById = Entities.toIdMap(sectionUniverse); +// Map<String, Basket> basketsById = Entities.toIdMap(basketUniverse); +// Map<String, Branchline> branchlinesById = Entities.toIdMap(branchlineUniverse); if (CollectionUtils.isNotEmpty(entities)) { @@ -104,26 +102,28 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { { - Section section = entity.getSection(); + SectionDto section = entity.getSection(); if (section != null) { // Get fully loaded section - section = sectionsById.get(section.getTopiaId()); - entity.setSection(section); +//FIXME +// section = sectionsById.get(section.getTopiaId()); +// entity.setSection(section); } } { - Basket basket = entity.getBasket(); + BasketDto basket = entity.getBasket(); if (basket != null) { // Get fully loaded basket - basket = basketsById.get(basket.getTopiaId()); - entity.setBasket(basket); +//FIXME +// basket = basketsById.get(basket.getTopiaId()); +// entity.setBasket(basket); // Must find out section - Section section = getSection(basket); + SectionDto section = getSection(basket); entity.setSection(section); } @@ -132,19 +132,20 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { { - Branchline branchline = entity.getBranchline(); + BranchlineDto branchline = entity.getBranchline(); if (branchline != null) { // Get fully loaded branchline - branchline = branchlinesById.get(branchline.getTopiaId()); - entity.setBranchline(branchline); +//FIXME +// branchline = branchlinesById.get(branchline.getTopiaId()); +// entity.setBranchline(branchline); // Must find out basket and section - Basket basket = getBasket(branchline); + BasketDto basket = getBasket(branchline); entity.setBasket(basket); // Must find out section - Section section = getSection(basket); + SectionDto section = getSection(basket); entity.setSection(section); } @@ -159,9 +160,9 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { public void resetPosition(E entity) { - Section section = entity.getSection(); - Basket basket = entity.getBasket(); - Branchline branchline = entity.getBranchline(); + SectionDto section = entity.getSection(); + BasketDto basket = entity.getBasket(); + BranchlineDto branchline = entity.getBranchline(); uiBranchline.setSelectedItem(null); uiSection.setSelectedItem(null); @@ -209,18 +210,18 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { } - public List<Section> getSectionUniverse() { + public List<SectionDto> getSectionUniverse() { return sectionUniverse; } - protected void onSectionChanged(Section newValue, E entity) { + protected void onSectionChanged(SectionDto newValue, E entity) { locationIsAdjusting = true; try { - Basket basket = entity.getBasket(); - Branchline branchline = entity.getBranchline(); + BasketDto basket = entity.getBasket(); + BranchlineDto branchline = entity.getBranchline(); // on deselectionne le panier entity.setBasket(null); @@ -229,17 +230,17 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { entity.setBranchline(null); // on vide l'ensemble des paniers - uiBasket.setData(Collections.<Basket>emptyList()); + uiBasket.setData(Collections.<BasketDto>emptyList()); // on vide l'ensemble des avançons - uiBranchline.setData(Collections.<Branchline>emptyList()); + uiBranchline.setData(Collections.<BranchlineDto>emptyList()); if (newValue != null) { // une section est sélectionnée // on remplit uniquement les paniers de cette section - List<Basket> baskets = newValue.getBasket(); + List<BasketDto> baskets = new ArrayList<>(newValue.getBasket()); uiBasket.setData(baskets); if (basket != null && baskets.contains(basket)) { @@ -247,7 +248,7 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { // un panier est sélectionné // on repmlit uniquement les avançons du panier - List<Branchline> branchlines = basket.getBranchline(); + List<BranchlineDto> branchlines = new ArrayList<>(basket.getBranchline()); uiBranchline.setData(branchlines); entity.setBasket(basket); @@ -270,24 +271,24 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { } - protected void onBasketChanged(Basket newValue, E entity) { + protected void onBasketChanged(BasketDto newValue, E entity) { if (!locationIsAdjusting) { - Branchline branchline = entity.getBranchline(); + BranchlineDto branchline = entity.getBranchline(); // on deselectionne l'avançon entity.setBranchline(null); // on vide l'ensemble des avançons - uiBranchline.setData(Collections.<Branchline>emptyList()); + uiBranchline.setData(Collections.<BranchlineDto>emptyList()); if (newValue != null) { // un panier est selectionne // on remplit uniquement les avançons des paniers - List<Branchline> branchlines = newValue.getBranchline(); + List<BranchlineDto> branchlines = new ArrayList<>(newValue.getBranchline()); uiBranchline.setData(branchlines); if (branchline != null && branchlines.contains(branchline)) { @@ -303,11 +304,11 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { } - protected Section getSection(Basket basket) { + protected SectionDto getSection(BasketDto basket) { - Section result = null; + SectionDto result = null; - for (Section section : sectionUniverse) { + for (SectionDto section : sectionUniverse) { if (!section.isBasketEmpty() && section.getBasket().contains(basket)) { @@ -321,11 +322,11 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { } - protected Basket getBasket(Branchline branchline) { + protected BasketDto getBasket(BranchlineDto branchline) { - Basket result = null; + BasketDto result = null; - for (Basket basket : basketUniverse) { + for (BasketDto basket : basketUniverse) { if (!basket.isBranchlineEmpty() && basket.getBranchline().contains(branchline)) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css index f0676f2..1a80380 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css @@ -26,7 +26,7 @@ } #sensorType { - property:{SensorUsed.PROPERTY_SENSOR_TYPE}; + property:{SensorUsedDto.PROPERTY_SENSOR_TYPE}; selectedItem:{tableEditBean.getSensorType()}; _validatorLabel:{t("observe.sensorUsed.sensorType")}; } @@ -37,7 +37,7 @@ } #sensorDataFormat { - property:{SensorUsed.PROPERTY_SENSOR_DATA_FORMAT}; + property:{SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT}; selectedItem:{tableEditBean.getSensorDataFormat()}; _validatorLabel:{t("observe.sensorUsed.sensorDataFormat")}; } @@ -48,7 +48,7 @@ } #sensorBrand { - property:{SensorUsed.PROPERTY_SENSOR_BRAND}; + property:{SensorUsedDto.PROPERTY_SENSOR_BRAND}; selectedItem:{tableEditBean.getSensorBrand()}; _validatorLabel:{t("observe.sensorUsed.sensorBrand")}; } @@ -59,14 +59,14 @@ } #sensorSerialNo { - _tablePropertyName:{SensorUsed.PROPERTY_SENSOR_SERIAL_NO}; + _tablePropertyName:{SensorUsedDto.PROPERTY_SENSOR_SERIAL_NO}; text:{tableEditBean.getSensorSerialNo()}; _validatorLabel:{t("observe.sensorUsed.sensorSerialNo")}; } #resetSensorSerialNo { toolTipText:"observe.sensorUsed.action.reset.sensorSerialNo.tip"; - _resetTablePropertyName: {SensorUsed.PROPERTY_SENSOR_SERIAL_NO}; + _resetTablePropertyName: {SensorUsedDto.PROPERTY_SENSOR_SERIAL_NO}; } #dataLocationLabel { @@ -76,13 +76,13 @@ } #dataLocation { - _tablePropertyName:{SensorUsed.PROPERTY_DATA_LOCATION}; + _tablePropertyName:{SensorUsedDto.PROPERTY_DATA_LOCATION}; text:{tableEditBean.getDataLocation()}; } #resetDataLocation { toolTipText:"observe.sensorUsed.action.reset.dataLocation.tip"; - _resetTablePropertyName: {SensorUsed.PROPERTY_DATA_LOCATION}; + _resetTablePropertyName: {SensorUsedDto.PROPERTY_DATA_LOCATION}; focusable:false; } 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 1be3251..f56ebe3 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 @@ -31,7 +31,7 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.ActivityLonglineDto fr.ird.observe.services.dto.longline.SensorUsedDto fr.ird.observe.services.dto.referential.longline.SensorTypeDto 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 8c35c05..83ee3ca 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 @@ -25,13 +25,17 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +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; @@ -61,7 +65,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, SensorUsed> { +public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineDto, SensorUsedDto> { /** Logger */ static private Log log = LogFactory.getLog(SensorUsedUIHandler.class); @@ -76,7 +80,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, } @Override - protected void onSelectedRowChanged(int editingRow, SensorUsed bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, SensorUsedDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); @@ -103,9 +107,9 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, n("observe.sensorUsed.table.dataLocation"), n("observe.sensorUsed.table.dataLocation.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SensorType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SensorBrand.class)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, SensorDataFormat.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SensorTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SensorBrandDto.class)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, SensorDataFormatDto.class)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newBooleanTableCellRenderer(renderer, new Predicate<Object>() { @Override @@ -116,12 +120,13 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, UIHelper.setTableColumnRenderer(table, 5, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, - DataService dataService, - DataSource dataSource) { - return dataContext.getSelectedActivityId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, +// DataService dataService, +// DataSource dataSource) { +// return dataContext.getSelectedActivityId(); +// } public void importData() { @@ -181,19 +186,22 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, public void exportData() { - String filename; - try { - filename = getDataService().getSensorUsedDataFilename(getDataSource(), getTableEditBean()); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not obtain sensorUser data export filename", e); - } + //FIXME +// String filename; +// try { +// filename = getDataService().getSensorUsedDataFilename(getDataSource(), getTableEditBean()); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not obtain sensorUser data export filename", e); +// } File file = JaxxFileChooser .forSaving() .setParent(getUi()) .setTitle(t("observe.title.choose.sensorUsed.exportData")) .setApprovalText(t("observe.action.choose.sensorUsed.exportData")) - .setFilename(filename) + //FIXME +// .setFilename(filename) + .setFilename(null) .setUseAcceptAllFileFilter(true) .choose(); 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 d835930..a510d69 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 @@ -22,10 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.ObserveServiceHelper; 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; /** @@ -34,23 +31,24 @@ import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupport<SizeMeasure> { +public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupport<SizeMeasureDto> { private static final long serialVersionUID = 1L; public SizeMeasuresTableModel() { - super(ObserveServiceHelper.get().getBinderService().getSimpleTopiaBinder(SizeMeasure.class)); - + //FIXME +// super(ObserveServiceHelper.get().getBinderService().getSimpleTopiaBinder(SizeMeasureDto.class)); + super(); } @Override - public boolean isRowNotEmpty(SizeMeasure valid) { + public boolean isRowNotEmpty(SizeMeasureDto valid) { return !(valid.getSizeMeasureType() == null && valid.getSize() == null); } @Override - protected boolean isRowValid(SizeMeasure valid) { + protected boolean isRowValid(SizeMeasureDto valid) { Float size = valid.getSize(); return !(valid.getSizeMeasureType() == null || size == null) && size > 0 && size < 1000; } @@ -63,7 +61,7 @@ public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupp @Override public Object getValueAt(int rowIndex, int columnIndex) { - SizeMeasure measure = data.get(rowIndex); + SizeMeasureDto measure = data.get(rowIndex); Object result; switch (columnIndex) { case 0: @@ -81,11 +79,12 @@ public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupp @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - SizeMeasure measure = data.get(rowIndex); + SizeMeasureDto measure = data.get(rowIndex); switch (columnIndex) { case 0: - measure.setSizeMeasureType((SizeMeasureType) aValue); + //FIXME +// measure.setSizeMeasureType((SizeMeasureTypeDto) aValue); break; case 1: @@ -101,8 +100,8 @@ public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupp } @Override - protected SizeMeasure createNewRow() { - return new SizeMeasureImpl(); + protected SizeMeasureDto createNewRow() { + return new SizeMeasureDto(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css index 209344f..acc31e7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css @@ -36,12 +36,12 @@ #homeId { text: {getStringValue(tableEditBean.getHomeId())}; - _tablePropertyName: {Tdr.PROPERTY_HOME_ID}; + _tablePropertyName: {TdrDto.PROPERTY_HOME_ID}; } #resetHomeId { toolTipText:"observe.tdr.action.reset.homeId.tip"; - _resetTablePropertyName: {Tdr.PROPERTY_HOME_ID}; + _resetTablePropertyName: {TdrDto.PROPERTY_HOME_ID}; } #serialNoLabel { @@ -51,12 +51,12 @@ #serialNo { text: {getStringValue(tableEditBean.getSerialNo())}; - _tablePropertyName: {Tdr.PROPERTY_SERIAL_NO}; + _tablePropertyName: {TdrDto.PROPERTY_SERIAL_NO}; } #resetSerialNo { toolTipText:"observe.tdr.action.reset.serialNo.tip"; - _resetTablePropertyName: {Tdr.PROPERTY_SERIAL_NO}; + _resetTablePropertyName: {TdrDto.PROPERTY_SERIAL_NO}; } @@ -66,7 +66,7 @@ } #sensorBrand { - property:{Tdr.PROPERTY_SENSOR_BRAND}; + property:{TdrDto.PROPERTY_SENSOR_BRAND}; selectedItem:{tableEditBean.getSensorBrand()}; } @@ -77,13 +77,13 @@ } #dataLocation { - _tablePropertyName:{Tdr.PROPERTY_DATA_LOCATION}; + _tablePropertyName:{TdrDto.PROPERTY_DATA_LOCATION}; text:{tableEditBean.getDataLocation()}; } #resetDataLocation { toolTipText:"observe.tdr.action.reset.dataLocation.tip"; - _resetTablePropertyName: {Tdr.PROPERTY_DATA_LOCATION}; + _resetTablePropertyName: {TdrDto.PROPERTY_DATA_LOCATION}; focusable:false; } @@ -131,7 +131,7 @@ } #section { - property:{Tdr.PROPERTY_SECTION}; + property:{TdrDto.PROPERTY_SECTION}; selectedItem:{tableEditBean.getSection()}; _listNoLoad:{true}; _validatorLabel: {t("observe.tdr.section")}; @@ -143,7 +143,7 @@ } #basket { - property:{Tdr.PROPERTY_BASKET}; + property:{TdrDto.PROPERTY_BASKET}; selectedItem:{tableEditBean.getBasket()}; _listNoLoad:{true}; _validatorLabel: {t("observe.tdr.basket")}; @@ -155,7 +155,7 @@ } #branchline { - property:{Tdr.PROPERTY_BRANCHLINE}; + property:{TdrDto.PROPERTY_BRANCHLINE}; selectedItem:{tableEditBean.getBranchline()}; _listNoLoad:{true}; _validatorLabel: {t("observe.tdr.branchline")}; @@ -167,7 +167,7 @@ } #itemHorizontalPosition { - property:{Tdr.PROPERTY_ITEM_HORIZONTAL_POSITION}; + property:{TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION}; selectedItem:{tableEditBean.getItemHorizontalPosition()}; _validatorLabel: {t("observe.tdr.itemHorizontalPosition")}; } @@ -178,7 +178,7 @@ } #itemVerticalPosition { - property:{Tdr.PROPERTY_ITEM_VERTICAL_POSITION}; + property:{TdrDto.PROPERTY_ITEM_VERTICAL_POSITION}; selectedItem:{tableEditBean.getItemVerticalPosition()}; _validatorLabel: {t("observe.tdr.itemVerticalPosition")}; } @@ -189,7 +189,7 @@ } #floatline1Length { - property:{Tdr.PROPERTY_FLOATLINE1_LENGTH}; + property:{TdrDto.PROPERTY_FLOATLINE1_LENGTH}; model:{tableEditBean.getFloatline1Length()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel: {t("observe.tdr.floatline1Length")}; @@ -201,7 +201,7 @@ } #floatline2Length { - property:{Tdr.PROPERTY_FLOATLINE2_LENGTH}; + property:{TdrDto.PROPERTY_FLOATLINE2_LENGTH}; model:{tableEditBean.getFloatline2Length()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel: {t("observe.tdr.floatline2Length")}; @@ -229,36 +229,36 @@ #deployementStart { label:{t("observe.tdr.deployementStart")}; date:{tableEditBean.getDeployementStart()}; - propertyDate: {Tdr.PROPERTY_DEPLOYEMENT_START}; - propertyDayDate: {Tdr.PROPERTY_DEPLOYEMENT_START_DATE}; - propertyTimeDate: {Tdr.PROPERTY_DEPLOYEMENT_START_TIME}; + propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_START}; + //propertyDayDate: {TdrDto.PROPERTY_DEPLOYEMENT_START_DATE}; + //propertyTimeDate: {TdrDto.PROPERTY_DEPLOYEMENT_START_TIME}; _validatorLabel: {t("observe.tdr.deployementStart")}; } #deployementEnd { label:{t("observe.tdr.deployementEnd")}; date:{tableEditBean.getDeployementEnd()}; - propertyDate: {Tdr.PROPERTY_DEPLOYEMENT_END}; - propertyDayDate: {Tdr.PROPERTY_DEPLOYEMENT_END_DATE}; - propertyTimeDate: {Tdr.PROPERTY_DEPLOYEMENT_END_TIME}; + propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_END}; + //propertyDayDate: {TdrDto.PROPERTY_DEPLOYEMENT_END_DATE}; + //propertyTimeDate: {TdrDto.PROPERTY_DEPLOYEMENT_END_TIME}; _validatorLabel: {t("observe.tdr.deployementEnd")}; } #fishingStart { label:{t("observe.tdr.fishingStart")}; date:{tableEditBean.getFishingStart()}; - propertyDate: {Tdr.PROPERTY_FISHING_START}; - propertyDayDate: {Tdr.PROPERTY_FISHING_START_DATE}; - propertyTimeDate: {Tdr.PROPERTY_FISHING_START_TIME}; + propertyDate: {TdrDto.PROPERTY_FISHING_START}; + //propertyDayDate: {TdrDto.PROPERTY_FISHING_START_DATE}; + //propertyTimeDate: {TdrDto.PROPERTY_FISHING_START_TIME}; _validatorLabel: {t("observe.tdr.fishingStart")}; } #fishingEnd { label:{t("observe.tdr.fishingEnd")}; date:{tableEditBean.getFishingEnd()}; - propertyDate: {Tdr.PROPERTY_FISHING_END}; - propertyDayDate: {Tdr.PROPERTY_FISHING_END_DATE}; - propertyTimeDate: {Tdr.PROPERTY_FISHING_END_TIME}; + propertyDate: {TdrDto.PROPERTY_FISHING_END}; + //propertyDayDate: {TdrDto.PROPERTY_FISHING_END_DATE}; + //propertyTimeDate: {TdrDto.PROPERTY_FISHING_END_TIME}; _validatorLabel: {t("observe.tdr.fishingEnd")}; } @@ -277,7 +277,7 @@ } #fishingStartDepth { - property:{Tdr.PROPERTY_FISHING_START_DEPTH}; + property:{TdrDto.PROPERTY_FISHING_START_DEPTH}; model:{tableEditBean.getFishingStartDepth()}; _validatorLabel: {t("observe.tdr.fishingStartDepth")}; } @@ -288,7 +288,7 @@ } #fishingEndDepth { - property:{Tdr.PROPERTY_FISHING_END_DEPTH}; + property:{TdrDto.PROPERTY_FISHING_END_DEPTH}; model:{tableEditBean.getFishingEndDepth()}; _validatorLabel: {t("observe.tdr.fishingEndDepth")}; } @@ -299,7 +299,7 @@ } #meanDeployementDepth { - property:{Tdr.PROPERTY_MEAN_DEPLOYEMENT_DEPTH}; + property:{TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH}; model:{tableEditBean.getMeanDeployementDepth()}; _validatorLabel: {t("observe.tdr.meanDeployementDepth")}; } @@ -310,7 +310,7 @@ } #medianDeployementDepth { - property:{Tdr.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH}; + property:{TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH}; model:{tableEditBean.getMedianDeployementDepth()}; _validatorLabel: {t("observe.tdr.medianDeployementDepth")}; } @@ -321,7 +321,7 @@ } #minFishingDepth { - property:{Tdr.PROPERTY_MIN_FISHING_DEPTH}; + property:{TdrDto.PROPERTY_MIN_FISHING_DEPTH}; model:{tableEditBean.getMinFishingDepth()}; _validatorLabel: {t("observe.tdr.minFishingDepth")}; } @@ -332,7 +332,7 @@ } #maxFishingDepth { - property:{Tdr.PROPERTY_MAX_FISHING_DEPTH}; + property:{TdrDto.PROPERTY_MAX_FISHING_DEPTH}; model:{tableEditBean.getMaxFishingDepth()}; _validatorLabel: {t("observe.tdr.maxFishingDepth")}; } @@ -343,7 +343,7 @@ } #meanFishingDepth { - property:{Tdr.PROPERTY_MEAN_FISHING_DEPTH}; + property:{TdrDto.PROPERTY_MEAN_FISHING_DEPTH}; model:{tableEditBean.getMeanFishingDepth()}; _validatorLabel: {t("observe.tdr.meanFishingDepth")}; } @@ -354,7 +354,7 @@ } #medianFishingDepth { - property:{Tdr.PROPERTY_MEDIAN_FISHING_DEPTH}; + property:{TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH}; model:{tableEditBean.getMedianFishingDepth()}; _validatorLabel: {t("observe.tdr.medianFishingDepth")}; } @@ -369,8 +369,10 @@ } #species { - property: {Tdr.PROPERTY_SPECIES}; - selected:{tableEditBean.getSpecies()}; + //FIXME + //property: {TdrDto.PROPERTY_SPECIES}; + //FIXME + //selected:{tableEditBean.getSpecies()}; _validatorLabel: {t("observe.tdr.species")}; showListLabel: true; universeLabel:{t("observe.tdr.availableSpecies")}; 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 1366299..5632352 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 @@ -25,7 +25,6 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.ObserveTechnicalException; @@ -33,6 +32,9 @@ import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +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; @@ -78,7 +80,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { +public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> { /** Logger */ static private Log log = LogFactory.getLog(TdrUIHandler.class); @@ -105,8 +107,9 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { protected boolean toogleTimeEditorSliderIsChanging; - JAXXContextEntryDef<LonglinePositionHelper<Tdr>> POSITION_HELPER_ENTRY = - UIHelper.newContextEntryDef("TdrUI-positionHelper", LonglinePositionHelper.class); + //FIXME +// JAXXContextEntryDef<LonglinePositionHelper<TdrDto>> POSITION_HELPER_ENTRY = +// UIHelper.newContextEntryDef("TdrUI-positionHelper", LonglinePositionHelper.class); public TdrUIHandler(TdrUI ui) { super(ui, DataContextType.SetLongline); @@ -118,9 +121,9 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } @Override - protected void onSelectedRowChanged(int editingRow, Tdr bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, TdrDto bean, boolean create) { - ContentTableModel<SetLongline, Tdr> model = getTableModel(); + ContentTableModel<SetLonglineDto, TdrDto> model = getTableModel(); TdrUI ui = getUi(); @@ -142,7 +145,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { // set date - time - SetLongline setLongline = getBean(); + SetLonglineDto setLongline = getBean(); Date settingStartTimeStamp = setLongline.getSettingStartTimeStamp(); setTimestamp(bean, settingStartTimeStamp); @@ -160,8 +163,9 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); - positionHelper.resetPosition(bean); + //FIXME +// LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); +// positionHelper.resetPosition(bean); requestFocus.requestFocus(); @@ -184,7 +188,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { UIHelper.setTableColumnRenderer(table, 0, UIHelper.newStringTableCellRenderer(renderer, 10, true)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newStringTableCellRenderer(renderer, 10, true)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, SensorBrand.class)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, SensorBrandDto.class)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newBooleanTableCellRenderer(renderer, new Predicate<Object>() { @Override public boolean apply(Object input) { @@ -194,10 +198,11 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } @Override public void initUI() throws Exception { @@ -209,13 +214,13 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { super.initUI(); - LonglinePositionHelper<Tdr> positionHelper = new LonglinePositionHelper<Tdr>( - getUi().getSection(), - getUi().getBasket(), - getUi().getBranchline(), - getTableEditBean()); +// LonglinePositionHelper<TdrDto> positionHelper = new LonglinePositionHelper<TdrDto>( +// getUi().getSection(), +// getUi().getBasket(), +// getUi().getBranchline(), +// getTableEditBean()); - POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); +// POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); getUi().getDeployementStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); getUi().getDeployementEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); @@ -233,8 +238,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { super.openUI(); // Reset all sections - LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - getUi().getSection().setData(positionHelper.getSectionUniverse()); +// LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// getUi().getSection().setData(positionHelper.getSectionUniverse()); // To be sure always remove listener (could prevent some leaks) getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); @@ -258,26 +263,27 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - @Override - protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { - - SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); - - // load sections (and baskets and branchlines) - List<Section> sections = dataService.getSections(dataSource, setLongline.getTopiaId()); - - LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - positionHelper.initSections(sections, getTableModel().getData()); - - return setLongline; - - } + //FIXME +// @Override +// protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); +// +// // load sections (and baskets and branchlines) +// List<Section> sections = dataService.getSections(dataSource, setLongline.getTopiaId()); +// +// LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// positionHelper.initSections(sections, getTableModel().getData()); +// +// return setLongline; +// +// } @Override protected void resetEditBean() { super.resetEditBean(); - Tdr tableEditBean = getTableEditBean(); + TdrDto tableEditBean = getTableEditBean(); boolean withTimestamp = tableEditBean.getFishingStart() != null; getUi().getEnableTimestamp().setSelected(withTimestamp); @@ -290,7 +296,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { if (enableTimestamp) { - SetLongline setLongline = getBean(); + SetLonglineDto setLongline = getBean(); timeStamp = setLongline.getSettingStartTimeStamp(); } else { @@ -299,7 +305,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - Tdr bean = getTableEditBean(); + TdrDto bean = getTableEditBean(); setTimestamp(bean, timeStamp); } @@ -362,19 +368,22 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { public void exportData() { - String filename; - try { - filename = getDataService().getTdrDataFilename(getDataSource(), getTableEditBean()); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not obtain tdr data export filename", e); - } + //FIXME +// String filename; +// try { +// filename = getDataService().getTdrDataFilename(getDataSource(), getTableEditBean()); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not obtain tdr data export filename", e); +// } File file = JaxxFileChooser .forSaving() .setParent(getUi()) .setTitle(t("observe.title.choose.tdr.exportData")) .setApprovalText(t("observe.action.choose.tdr.exportData")) - .setFilename(filename) + //FIXME +// .setFilename(filename) + .setFilename(null) .setUseAcceptAllFileFilter(true) .choose(); @@ -469,7 +478,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - protected void setTimestamp(Tdr bean, Date timestamp) { + protected void setTimestamp(TdrDto bean, Date timestamp) { bean.setDeployementStart(timestamp); bean.setDeployementEnd(timestamp); 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 7ea091e..1f8cf05 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 @@ -22,10 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.ObserveServiceHelper; 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; /** @@ -34,28 +31,28 @@ import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class WeightMeasuresTableModel extends EditableTableWithCacheTableModelSupport<WeightMeasure> { +public class WeightMeasuresTableModel extends EditableTableWithCacheTableModelSupport<WeightMeasureDto> { private static final long serialVersionUID = 1L; public WeightMeasuresTableModel() { - super(ObserveServiceHelper.get().getBinderService().getSimpleTopiaBinder(WeightMeasure.class)); + super(); } @Override - public boolean isRowNotEmpty(WeightMeasure valid) { + public boolean isRowNotEmpty(WeightMeasureDto valid) { return !(valid.getWeightMeasureType() == null && valid.getWeight() == null); } @Override - public boolean isRowValid(WeightMeasure valid) { + public boolean isRowValid(WeightMeasureDto valid) { Float weight = valid.getWeight(); return !(valid.getWeightMeasureType() == null || weight == null) && weight > 0 && weight < 1000; } @Override - protected WeightMeasure createNewRow() { - return new WeightMeasureImpl(); + protected WeightMeasureDto createNewRow() { + return new WeightMeasureDto(); } @Override @@ -66,7 +63,7 @@ public class WeightMeasuresTableModel extends EditableTableWithCacheTableModelSu @Override public Object getValueAt(int rowIndex, int columnIndex) { - WeightMeasure measure = data.get(rowIndex); + WeightMeasureDto measure = data.get(rowIndex); Object result; switch (columnIndex) { case 0: @@ -84,11 +81,12 @@ public class WeightMeasuresTableModel extends EditableTableWithCacheTableModelSu @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - WeightMeasure measure = data.get(rowIndex); + WeightMeasureDto measure = data.get(rowIndex); switch (columnIndex) { case 0: - measure.setWeightMeasureType((WeightMeasureType) aValue); + //FIXME +// measure.setWeightMeasureType((WeightMeasureTypeDto) aValue); break; case 1: 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 e505b72..4056281 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 @@ -24,7 +24,8 @@ package fr.ird.observe.ui.content.table.impl.seine; 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.services.dto.referential.GearCaracteristicTypeDtos; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; @@ -119,21 +120,22 @@ public class GearUseFeatureMeasurementCellEditor extends AbstractCellEditor impl @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - GearCaracteristic caracteristic = (GearCaracteristic) table.getModel().getValueAt(row, caracteristicColumn); + GearCaracteristicDto caracteristic = (GearCaracteristicDto) table.getModel().getValueAt(row, caracteristicColumn); if (caracteristic == null) { // can't edit a null value ? editor = table.getDefaultEditor(Object.class); } else { - GearCaracteristicType gearCaracteristicType = caracteristic.getGearCaracteristicType(); + ReferentialReferenceDto<GearCaracteristicTypeDto> gearCaracteristicType = caracteristic.getGearCaracteristicType(); - String gearCaracteristicTypeId = gearCaracteristicType.getTopiaId(); + String gearCaracteristicTypeId = gearCaracteristicType.getId(); Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table); editor = editors.get(gearCaracteristicTypeId); - value = GearCaracteristicTypes.getTypeValue(gearCaracteristicType, value); + //FIXME +// value = GearCaracteristicTypeDtos.getTypeValue(gearCaracteristicType, value); } 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 2041e3e..7ad11bf 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 @@ -24,13 +24,13 @@ package fr.ird.observe.ui.content.table.impl.seine; 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.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.ui.UIHelper; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import java.awt.Component; +import java.awt.*; import java.util.Map; import java.util.TreeMap; @@ -89,19 +89,20 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer TableCellRenderer tableCellRenderer; - GearCaracteristic caracteristic = (GearCaracteristic) table.getModel().getValueAt(row, caracteristicColumn); + GearCaracteristicDto caracteristic = (GearCaracteristicDto) table.getModel().getValueAt(row, caracteristicColumn); if (caracteristic == null) { tableCellRenderer = table.getDefaultRenderer(Object.class); } else { - GearCaracteristicType gearCaracteristicType = caracteristic.getGearCaracteristicType(); + ReferentialReferenceDto<GearCaracteristicTypeDto> gearCaracteristicType = caracteristic.getGearCaracteristicType(); - String gearCaracteristicTypeId = gearCaracteristicType.getTopiaId(); + String gearCaracteristicTypeId = gearCaracteristicType.getId(); tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); - value = GearCaracteristicTypes.getTypeValue(gearCaracteristicType, value); + //FIXME +// value = GearCaracteristicTypeDtos.getTypeValue(gearCaracteristicType, value); } 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 2792d07..3c34671 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,11 +22,8 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ -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; /** * Created on 4/7/15. @@ -38,8 +35,8 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit private static final long serialVersionUID = 1L; - public GearUseFeaturesMeasurementSeinesTableModel(TopiaEntityBinder<GearUseFeaturesMeasurementSeineDto> topiaBinder) { - super(topiaBinder); + public GearUseFeaturesMeasurementSeinesTableModel() { + super(); } @Override @@ -85,7 +82,7 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit result = true; break; case 1: - GearUseFeaturesMeasurementSeine measure = data.get(rowIndex); + GearUseFeaturesMeasurementSeineDto measure = data.get(rowIndex); result = measure != null && measure.getGearCaracteristic() != null; break; default: @@ -102,7 +99,8 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit switch (columnIndex) { case 0: - measure.setGearCaracteristic((GearCaracteristic) aValue); + //FIXME +// measure.setGearCaracteristic((GearCaracteristicDto) aValue); break; case 1: 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 eb7d322..0e98438 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 @@ -23,6 +23,7 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -82,13 +83,13 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeineD GearUseFeaturesSeineDto rowBean = getRowBean(); GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - if (rowBean.getTopiaId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { + if (rowBean.getId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { // new gear usage, add default measurements - Gear gear = rowBean.getGear(); + ReferentialReferenceDto<GearDto> gear = rowBean.getGear(); List<GearUseFeaturesMeasurementSeineDto> measurements = - gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getTopiaId()); + gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getId()); 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.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css index d2f186b..355ef0f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css @@ -41,7 +41,7 @@ } #gear { - property:{GearUseFeaturesSeine.PROPERTY_GEAR}; + property:{GearUseFeaturesSeineDto.PROPERTY_GEAR}; selectedItem:{tableEditBean.getGear()}; } @@ -51,7 +51,7 @@ } #number { - property:{GearUseFeaturesSeine.PROPERTY_NUMBER}; + property:{GearUseFeaturesSeineDto.PROPERTY_NUMBER}; model:{tableEditBean.getNumber()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -63,7 +63,7 @@ #usedInTrip { booleanValue:{tableEditBean.getUsedInTrip()}; - _tablePropertyName:{GearUseFeaturesSeine.PROPERTY_USED_IN_TRIP}; + _tablePropertyName:{GearUseFeaturesSeineDto.PROPERTY_USED_IN_TRIP}; } /* ***************************************************************************** */ @@ -86,7 +86,7 @@ } #comment2 { - _tablePropertyName: {GearUseFeaturesSeine.PROPERTY_COMMENT}; + _tablePropertyName: {GearUseFeaturesSeineDto.PROPERTY_COMMENT}; text:{getStringValue(tableEditBean.getComment())}; } 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 fa0cd18..ffc8800 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 @@ -29,11 +29,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto 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 @@ -100,7 +99,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/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 8c2218c..f353f88 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 @@ -22,15 +22,17 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDAODto; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +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.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -44,9 +46,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; 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.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -79,7 +78,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSeine, GearUseFeaturesSeine> { +public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSeineDto, GearUseFeaturesSeineDto> { /** Logger */ static private Log log = LogFactory.getLog(GearUseFeaturesSeineUIHandler.class); @@ -118,7 +117,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } @Override - protected void onSelectedRowChanged(int editingRow, GearUseFeaturesSeine bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, GearUseFeaturesSeineDto bean, boolean create) { if (log.isInfoEnabled()) { log.info("Selected row changed: " + editingRow + ", create? " + create); @@ -136,7 +135,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei // load size measures GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - List<GearUseFeaturesMeasurementSeine> measurements = emptySelection ? Collections.<GearUseFeaturesMeasurementSeine>emptyList() : measurementsTableModel.getCacheForRow(editingRow); + List<GearUseFeaturesMeasurementSeineDto> measurements = emptySelection ? Collections.<GearUseFeaturesMeasurementSeineDto>emptyList() : measurementsTableModel.getCacheForRow(editingRow); if (measurements == null) { if (log.isInfoEnabled()) { @@ -157,16 +156,17 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } else { // updating mode: loading from db - try { - - measurements = getDataService().getGearUseFeaturesMeasurementSeine(getDataSource(), bean, measurementsTableModel.getLoader()); - if (log.isInfoEnabled()) { - log.info("Loaded measurements (" + bean.getTopiaId() + "): " + measurements.size()); - } - - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load measurements", e); - } + //FIXME +// try { +// +// measurements = getDataService().getGearUseFeaturesMeasurementSeine(getDataSource(), bean, measurementsTableModel.getLoader()); +// if (log.isInfoEnabled()) { +// log.info("Loaded measurements (" + bean.getTopiaId() + "): " + measurements.size()); +// } +// +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load measurements", e); +// } } // init measurements @@ -223,7 +223,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei n("observe.gearUseFeaturesSeine.table.comment"), n("observe.gearUseFeaturesSeine.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Gear.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newBooleanTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); @@ -239,20 +239,21 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei n("observe.gearUseFeaturesSeine.table.value"), n("observe.gearUseFeaturesSeine.table.value.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearCaracteristic.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearCaracteristicDto.class)); UIHelper.setTableColumnRenderer(table, 1, new GearUseFeatureMeasurementCellRenderer(0, renderer)); table.getTableHeader().setReorderingAllowed(false); - Decorator<GearCaracteristic> decorator = ObserveContext.get().getDecorator(GearCaracteristic.class); + Decorator<GearCaracteristicDto> decorator = ObserveContext.get().getDecorator(GearCaracteristicDto.class); - List<GearCaracteristic> list; - try { - list = getDataService().getList(getDataSource(), GearCaracteristic.class); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not get gear caracteristics", e); - } - UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); + //FIXME +// List<GearCaracteristicDto> list; +// try { +// list = getDataService().getList(getDataSource(), GearCaracteristic.class); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not get gear caracteristics", e); +// } +// UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); GearUseFeaturesMeasurementSeinesTableModel tableModel = getModel().getMeasurementsTableModel(); @@ -277,10 +278,11 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedTripSeineId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedTripSeineId(); +// } @Override public void initUI() throws Exception { @@ -301,17 +303,18 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } - @Override - protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { - - TripSeine tripSeine = super.loadEditBean(mode, dataContext, dataService, dataSource); - - // reset measurements - getModel().getMeasurementsTableModel().clear(); - - return tripSeine; - - } + //FIXME +// @Override +// protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// TripSeine tripSeine = super.loadEditBean(mode, dataContext, dataService, dataSource); +// +// // reset measurements +// getModel().getMeasurementsTableModel().clear(); +// +// return tripSeine; +// +// } @Override public void openUI() throws Exception { @@ -362,7 +365,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei if (!selectionEmpty) { - GearUseFeaturesMeasurementSeine data = tableModel.getSelectedRow(); + GearUseFeaturesMeasurementSeineDto data = tableModel.getSelectedRow(); if (log.isInfoEnabled()) { log.info("Delete: " + data); @@ -389,63 +392,64 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } - - @Override - protected TripSeine onCreate(TopiaContext tx, Object parentBean, TripSeine editBean) throws TopiaException { - return super.onCreate(tx, parentBean, editBean); - } - - @Override - protected void onUpdateFinalize(TopiaContext tx, TripSeine bean, Collection<GearUseFeaturesSeine> oldChilds) throws TopiaException { - - List<GearUseFeaturesSeine> gearUseFeatures = bean.getGearUseFeaturesSeine(); - - GearUseFeaturesSeineUIModel model = getModel(); - { - - // save measurments - - GearUseFeaturesMeasurementSeineDAO measureDao = ObserveDAOHelper.getGearUseFeaturesMeasurementSeineDAO(tx); - - GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - Set<Integer> rowsChanged = measurementsTableModel.getCacheRowsChanged(); - - TopiaEntityBinder<GearUseFeaturesMeasurementSeine> loader = measurementsTableModel.getLoader(); - for (Integer row : rowsChanged) { - - GearUseFeaturesSeine gearUseFeaturesSeine = gearUseFeatures.get(row); - - List<GearUseFeaturesMeasurementSeine> measurements = measurementsTableModel.getCacheForRow(row); - List<GearUseFeaturesMeasurementSeine> measurementsToSave = new ArrayList<GearUseFeaturesMeasurementSeine>(measurements.size()); - - for (GearUseFeaturesMeasurementSeine measure : measurements) { - - if (measurementsTableModel.isRowNotEmpty(measure)) { - - GearUseFeaturesMeasurementSeine measureToSave; - - if (measure.getTopiaId() == null) { - measureToSave = measureDao.create(measure); - loader.load(measureToSave, measure, true); - } else { - measureToSave = gearUseFeaturesSeine.getGearUseFeaturesMeasurementByTopiaId(measure.getTopiaId()); - loader.load(measure, measureToSave, true); - } - - measurementsToSave.add(measureToSave); - - } - - } - - gearUseFeaturesSeine.clearGearUseFeaturesMeasurement(); - gearUseFeaturesSeine.addAllGearUseFeaturesMeasurement(measurementsToSave); - - } - - } - - } + //FIXME +// @Override +// protected TripSeine onCreate(TopiaContext tx, Object parentBean, TripSeine editBean) throws TopiaException { +// return super.onCreate(tx, parentBean, editBean); +// } + + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, TripSeine bean, Collection<GearUseFeaturesSeine> oldChilds) throws TopiaException { +// +// List<GearUseFeaturesSeine> gearUseFeatures = bean.getGearUseFeaturesSeine(); +// +// GearUseFeaturesSeineUIModel model = getModel(); +// { +// +// // save measurments +// +// GearUseFeaturesMeasurementSeineDAO measureDao = ObserveDAOHelper.getGearUseFeaturesMeasurementSeineDAO(tx); +// +// GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); +// Set<Integer> rowsChanged = measurementsTableModel.getCacheRowsChanged(); +// +// TopiaEntityBinder<GearUseFeaturesMeasurementSeine> loader = measurementsTableModel.getLoader(); +// for (Integer row : rowsChanged) { +// +// GearUseFeaturesSeine gearUseFeaturesSeine = gearUseFeatures.get(row); +// +// List<GearUseFeaturesMeasurementSeine> measurements = measurementsTableModel.getCacheForRow(row); +// List<GearUseFeaturesMeasurementSeine> measurementsToSave = new ArrayList<GearUseFeaturesMeasurementSeine>(measurements.size()); +// +// for (GearUseFeaturesMeasurementSeine measure : measurements) { +// +// if (measurementsTableModel.isRowNotEmpty(measure)) { +// +// GearUseFeaturesMeasurementSeine measureToSave; +// +// if (measure.getTopiaId() == null) { +// measureToSave = measureDao.create(measure); +// loader.load(measureToSave, measure, true); +// } else { +// measureToSave = gearUseFeaturesSeine.getGearUseFeaturesMeasurementByTopiaId(measure.getTopiaId()); +// loader.load(measure, measureToSave, true); +// } +// +// measurementsToSave.add(measureToSave); +// +// } +// +// } +// +// gearUseFeaturesSeine.clearGearUseFeaturesMeasurement(); +// gearUseFeaturesSeine.addAllGearUseFeaturesMeasurement(measurementsToSave); +// +// } +// +// } +// +// } @Override protected void resetEditBean() { @@ -532,17 +536,19 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } - public List<GearUseFeaturesMeasurementSeine> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { - - try { - List<GearUseFeaturesMeasurementSeine> measurements = getDataService().getDefaultGearUseFeaturesMeasurementSeine(getDataSource(), gearId); - if (log.isInfoEnabled()) { - log.info("Create mode, use default measurements: " + measurements.size()); - } - return measurements; - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not create default measurements", e); - } + public List<GearUseFeaturesMeasurementSeineDto> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { + + //FIXME +// try { +// List<GearUseFeaturesMeasurementSeineDto> measurements = getDataService().getDefaultGearUseFeaturesMeasurementSeine(getDataSource(), gearId); +// if (log.isInfoEnabled()) { +// log.info("Create mode, use default measurements: " + measurements.size()); +// } +// return measurements; +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not create default measurements", e); +// } + return null; } 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 ad16a8e..58156ab 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 @@ -55,14 +55,16 @@ public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeineDt protected boolean generalTabValid; - //FIXME -// private final GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel; + private final GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel; public GearUseFeaturesSeineUIModel(GearUseFeaturesSeineUI ui) { super(TripSeineDto.class, GearUseFeaturesSeineDto.class, - new String[]{TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE}, + new String[]{ + //FIXME +// TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE + }, new String[]{ GearUseFeaturesSeineDto.PROPERTY_COMMENT, GearUseFeaturesSeineDto.PROPERTY_GEAR, @@ -88,7 +90,7 @@ public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeineDt // // } // -// this.measurementsTableModel = new GearUseFeaturesMeasurementSeinesTableModel(binder); + this.measurementsTableModel = new GearUseFeaturesMeasurementSeinesTableModel(); List<ContentTableMeta<GearUseFeaturesSeineDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(GearUseFeaturesSeineDto.class, GearUseFeaturesSeineDto.PROPERTY_GEAR, false), @@ -105,10 +107,9 @@ public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeineDt return new GearUseFeaturesSeineTableModel(ui, contentTableMetas); } - //FIXME -// public GearUseFeaturesMeasurementSeinesTableModel getMeasurementsTableModel() { -// return measurementsTableModel; -// } + 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.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css index fe9a827..deccd5f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css @@ -29,10 +29,11 @@ labelFor:{species}; } -#species { - property:{NonTargetCatch.PROPERTY_SPECIES}; - selectedItem:{tableEditBean.getSpecies()}; -} + //FIXME +//#species { +// property:{NonTargetCatchDto.PROPERTY_SPECIES}; +// selectedItem:{tableEditBean.getSpecies()}; +//} #speciesFateLabel { text:"observe.common.speciesFate"; @@ -40,7 +41,7 @@ } #speciesFate { - property:{NonTargetCatch.PROPERTY_SPECIES_FATE}; + property:{NonTargetCatchDto.PROPERTY_SPECIES_FATE}; selectedItem:{tableEditBean.getSpeciesFate()}; } @@ -50,7 +51,7 @@ } #reasonForDiscard { - property:{NonTargetCatch.PROPERTY_REASON_FOR_DISCARD}; + property:{NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD}; selectedItem:{tableEditBean.getReasonForDiscard()}; } @@ -60,7 +61,7 @@ } #catchWeight { - property:{NonTargetCatch.PROPERTY_CATCH_WEIGHT}; + property:{NonTargetCatchDto.PROPERTY_CATCH_WEIGHT}; useFloat:true; model:{tableEditBean.getCatchWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; @@ -79,7 +80,7 @@ } #totalCount { - property:{NonTargetCatch.PROPERTY_TOTAL_COUNT}; + property:{NonTargetCatchDto.PROPERTY_TOTAL_COUNT}; model:{tableEditBean.getTotalCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -97,7 +98,7 @@ } #meanWeight { - property:{NonTargetCatch.PROPERTY_MEAN_WEIGHT}; + property:{NonTargetCatchDto.PROPERTY_MEAN_WEIGHT}; model:{tableEditBean.getMeanWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; } @@ -115,7 +116,7 @@ } #meanLength { - property:{NonTargetCatch.PROPERTY_MEAN_LENGTH}; + property:{NonTargetCatchDto.PROPERTY_MEAN_LENGTH}; model:{tableEditBean.getMeanLength()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } 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 1a42d45..69b568c 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 @@ -32,14 +32,14 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto 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.seine.SpeciesFateDto fr.ird.observe.services.dto.referential.SpeciesDto - fr.ird.observe.services.dto.referential.seine.ReasonForDiscard + fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.ui.content.table.* - fr.ird.observe.validation.ObserveValidator + fr.ird.observe.business.validation.ObserveValidator jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -72,7 +72,8 @@ errorTableModel='{getErrorTableModel()}' context='n1-update-nonTargetCatch'> <!-- clef unique --> - <field name="nonTargetCatch" component="editorPanel"/> + <!--FIXME--> + <!--<field name="nonTargetCatch" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> @@ -91,7 +92,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='species' constructorParams='this' genericType='Species'/> + <BeanComboBox id='species' constructorParams='this' genericType='SpeciesDto'/> </cell> </row> @@ -101,7 +102,7 @@ <JLabel id='speciesFateLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='speciesFate' constructorParams='this' genericType='SpeciesFate'/> + <BeanComboBox id='speciesFate' constructorParams='this' genericType='SpeciesFateDto'/> </cell> </row> @@ -111,7 +112,7 @@ <JLabel id='reasonForDiscardLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReasonForDiscard'/> + <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReasonForDiscardDto'/> </cell> </row> 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 2a15648..637a5db 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 @@ -21,36 +21,25 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; -import fr.ird.observe.ObserveConfig; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSourceDto; -import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource; +import fr.ird.observe.services.dto.referential.SpeciesDto; +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.SetSeineDto; import fr.ird.observe.ui.UIHelper; -import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import jaxx.runtime.context.JAXXContextEntryDef; 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.persistence.util.TopiaEntityBinder; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -60,16 +49,16 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, NonTargetCatch> { +public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, NonTargetCatchDto> { /** Logger */ static private Log log = LogFactory.getLog(NonTargetCatchUIHandler.class); /** l'entrée dans le contexte pour récupérer la liste complete des speciess */ - protected final JAXXContextEntryDef<List<Species>> ALL_ESPECES_ENTRY = + protected final JAXXContextEntryDef<List<SpeciesDto>> ALL_ESPECES_ENTRY = UIHelper.newListContextEntryDef("NonTargetCatchUI-all-speciess"); - protected final JAXXContextEntryDef<List<NonTargetLength>> ALL_TAILLES_TO_DELETE_ENTRY = + protected final JAXXContextEntryDef<List<NonTargetLengthDto>> ALL_TAILLES_TO_DELETE_ENTRY = UIHelper.newListContextEntryDef("NonTargetCatchUI-all-taille-to-delete"); /** @@ -82,7 +71,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non protected final PropertyChangeListener totalCountChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetCatch source = (NonTargetCatch) evt.getSource(); + NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); source.setTotalCountComputedSource(null); } }; @@ -97,7 +86,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non protected final PropertyChangeListener catchWeightChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetCatch source = (NonTargetCatch) evt.getSource(); + NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); source.setCatchWeightComputedSource(null); } }; @@ -112,7 +101,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non protected final PropertyChangeListener meanWeightChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetCatch source = (NonTargetCatch) evt.getSource(); + NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); source.setMeanWeightComputedSource(null); } }; @@ -127,7 +116,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non protected final PropertyChangeListener meanLengthChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetCatch source = (NonTargetCatch) evt.getSource(); + NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); source.setMeanLengthComputedSource(null); } }; @@ -206,57 +195,58 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non getUi().getMeanLength().grabFocus(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } - - @Override - protected SetSeine loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - List<Species> speciesList; - - if (mode == ContentMode.UPDATE) { - - // get current ocean - Ocean ocean = dataService.getTripOcean( - dataSource, dataContext.getSelectedTripId()); - - ObserveConfig config = getUi().getContextValue(ObserveConfig.class); - String speciesListId = config.getSpeciesListSeineNonTargetCatchId(); - - // get all species - List<Species> allSpecies = - dataService.loadDecoratedSpecies(dataSource, speciesListId); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(allSpecies); - - // filtre par ocean - speciesList = Species2.filterByOcean(allSpecies, ocean); - - } else { - - speciesList = new ArrayList<Species>(); - } - - ALL_ESPECES_ENTRY.setContextValue(getUi(), speciesList); - if (log.isDebugEnabled()) { - log.debug("speciesList = " + speciesList.size()); - } - return super.loadEditBean(mode, dataContext, dataService, dataSource); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + +// @Override +// protected SetSeine loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// List<Species> speciesList; +// +// if (mode == ContentMode.UPDATE) { +// +// // get current ocean +// Ocean ocean = dataService.getTripOcean( +// dataSource, dataContext.getSelectedTripId()); +// +// ObserveConfig config = getUi().getContextValue(ObserveConfig.class); +// String speciesListId = config.getSpeciesListSeineNonTargetCatchId(); +// +// // get all species +// List<Species> allSpecies = +// dataService.loadDecoratedSpecies(dataSource, speciesListId); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(allSpecies); +// +// // filtre par ocean +// speciesList = Species2.filterByOcean(allSpecies, ocean); +// +// } else { +// +// speciesList = new ArrayList<Species>(); +// } +// +// ALL_ESPECES_ENTRY.setContextValue(getUi(), speciesList); +// if (log.isDebugEnabled()) { +// log.debug("speciesList = " + speciesList.size()); +// } +// return super.loadEditBean(mode, dataContext, dataService, dataSource); +// } @Override protected void onSelectedRowChanged(int editingRow, - NonTargetCatch bean, + NonTargetCatchDto bean, boolean create) { NonTargetCatchUI ui = getUi(); - ContentTableModel<SetSeine, NonTargetCatch> model = getTableModel(); + ContentTableModel<SetSeineDto, NonTargetCatchDto> model = getTableModel(); if (!model.isEditable()) { @@ -264,34 +254,38 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non return; } - List<Species> availableEspeces; + //FIXME +// List<SpeciesDto> availableEspeces; JComponent requestFocus; if (create) { - availableEspeces = new ArrayList<Species>(ALL_ESPECES_ENTRY.getContextValue(ui)); + //FIXME +// availableEspeces = new ArrayList<SpeciesDto>(ALL_ESPECES_ENTRY.getContextValue(ui)); requestFocus = ui.getSpecies(); } else { - Species species = bean.getSpecies(); - availableEspeces = Arrays.asList(species); + //FIXME +// SpeciesDto species = bean.getSpecies(); +// availableEspeces = Arrays.asList(species); requestFocus = ui.getTable(); } - ui.getSpecies().setData(availableEspeces); + //FIXME +// ui.getSpecies().setData(availableEspeces); requestFocus.requestFocus(); - NonTargetCatch tableEditBean = getTableEditBean(); - tableEditBean.removePropertyChangeListener(NonTargetCatch.PROPERTY_TOTAL_COUNT, totalCountChanged); - tableEditBean.addPropertyChangeListener(NonTargetCatch.PROPERTY_TOTAL_COUNT, totalCountChanged); + NonTargetCatchDto tableEditBean = getTableEditBean(); + tableEditBean.removePropertyChangeListener(NonTargetCatchDto.PROPERTY_TOTAL_COUNT, totalCountChanged); + tableEditBean.addPropertyChangeListener(NonTargetCatchDto.PROPERTY_TOTAL_COUNT, totalCountChanged); - tableEditBean.removePropertyChangeListener(NonTargetCatch.PROPERTY_CATCH_WEIGHT, catchWeightChanged); - tableEditBean.addPropertyChangeListener(NonTargetCatch.PROPERTY_CATCH_WEIGHT, catchWeightChanged); + tableEditBean.removePropertyChangeListener(NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, catchWeightChanged); + tableEditBean.addPropertyChangeListener(NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, catchWeightChanged); - tableEditBean.removePropertyChangeListener(NonTargetCatch.PROPERTY_MEAN_WEIGHT, meanWeightChanged); - tableEditBean.addPropertyChangeListener(NonTargetCatch.PROPERTY_MEAN_WEIGHT, meanWeightChanged); + tableEditBean.removePropertyChangeListener(NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, meanWeightChanged); + tableEditBean.addPropertyChangeListener(NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, meanWeightChanged); - tableEditBean.removePropertyChangeListener(NonTargetCatch.PROPERTY_MEAN_LENGTH, meanLengthChanged); - tableEditBean.addPropertyChangeListener(NonTargetCatch.PROPERTY_MEAN_LENGTH, meanLengthChanged); + tableEditBean.removePropertyChangeListener(NonTargetCatchDto.PROPERTY_MEAN_LENGTH, meanLengthChanged); + tableEditBean.addPropertyChangeListener(NonTargetCatchDto.PROPERTY_MEAN_LENGTH, meanLengthChanged); } @Override @@ -324,9 +318,9 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non n("observe.nonTargetCatch.table.comment"), n("observe.nonTargetCatch.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesFate.class)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReasonForDiscard.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesFateDto.class)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReasonForDiscardDto.class)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -334,113 +328,116 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non UIHelper.setTableColumnRenderer(table, 7, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } - @Override - protected boolean doSave(SetSeine bean, - DataService dataService, - DataSource dataSource, - TopiaEntityBinder<SetSeine> binder) throws Exception { - try { - return super.doSave(bean, dataService, dataSource, binder); - } finally { - - // toujours supprimer la référence du context, quoiqu'il arrive - ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); - } - } - - @Override - protected boolean prepareSave(SetSeine editBean, List<NonTargetCatch> objets) throws Exception { - super.prepareSave(editBean, objets); - - List<Species> speciessUsed = getTableModel().getColumnValues(0); - - Collection<Species> speciessToDelete = new HashSet<Species>(); - List<NonTargetLength> tailleToDelete = new ArrayList<NonTargetLength>(); - - getDataService().getObsoleteEspeceForNonTargetSample(getDataSource(), - editBean.getTopiaId(), - speciessUsed, - speciessToDelete, - tailleToDelete); - - if (!tailleToDelete.isEmpty()) { - - // il existe des echantillon faune a supprimer on demande une - // confirmation - StringBuilder sb = new StringBuilder(); - StringBuilder sb2 = new StringBuilder(); - Decorator<Species> decorator; - Decorator<NonTargetLength> decorator2; - decorator = getDecoratorService().getDecoratorByType(Species.class); - decorator2 = getDecoratorService().getDecoratorByType(NonTargetLength.class); - - for (Species e : speciessToDelete) { - sb.append(" - ").append(decorator.toString(e)).append('\n'); - } - for (NonTargetLength t : tailleToDelete) { - sb2.append(" - ").append(decorator2.toString(t)).append('\n'); - } - int reponse = UIHelper.askUser( - t("observe.title.need.confirm"), - t("observe.nonTargetCatch.message.table.will.delete.nonTargetSample", sb.toString(), sb2.toString()), - JOptionPane.ERROR_MESSAGE, - new Object[]{ - t("observe.choice.continue"), - t("observe.choice.cancel")}, - 0); - if (log.isDebugEnabled()) { - log.debug("response : " + reponse); - } - boolean canContinue = false; - switch (reponse) { - case 0: - // wil reset ui - canContinue = true; - break; - } - if (!canContinue) { - // l'utilisateur a choisi de ne pas continuer - return false; - } - - // on conserve les tailles a supprimer - ALL_TAILLES_TO_DELETE_ENTRY.setContextValue(getUi(), tailleToDelete); - } - - // mise a jour de la propriete nonTargetDiscarded - - boolean hasRejet = false; - for (NonTargetCatch c : objets) { - if (c.getReasonForDiscard() != null) { - // on a trouve un rejet de faune - hasRejet = true; - break; - } - } - editBean.setNonTargetDiscarded(hasRejet); - - return true; - } - - @Override - protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<NonTargetCatch> oldChilds) { - - List<NonTargetLength> tailleToDelete = - ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); - - if (tailleToDelete != null && !tailleToDelete.isEmpty()) { - - // on a demande la suppression de taille obsoletes - - if (log.isInfoEnabled()) { - log.info("Will remove " + tailleToDelete.size() + - " obsolete nonTargetSample(s)."); - } - - NonTargetSample echantillon = bean.getNonTargetSample().get(0); - - // on supprime les echantillons obsoletes - echantillon.getNonTargetLength().removeAll(tailleToDelete); - } - } + //FIXME +// @Override +// protected boolean doSave(SetSeine bean, +// DataService dataService, +// DataSource dataSource, +// TopiaEntityBinder<SetSeine> binder) throws Exception { +// try { +// return super.doSave(bean, dataService, dataSource, binder); +// } finally { +// +// // toujours supprimer la référence du context, quoiqu'il arrive +// ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); +// } +// } + + //FIXME +// @Override +// protected boolean prepareSave(SetSeine editBean, List<NonTargetCatch> objets) throws Exception { +// super.prepareSave(editBean, objets); +// +// List<Species> speciessUsed = getTableModel().getColumnValues(0); +// +// Collection<Species> speciessToDelete = new HashSet<Species>(); +// List<NonTargetLength> tailleToDelete = new ArrayList<NonTargetLength>(); +// +// getDataService().getObsoleteEspeceForNonTargetSample(getDataSource(), +// editBean.getTopiaId(), +// speciessUsed, +// speciessToDelete, +// tailleToDelete); +// +// if (!tailleToDelete.isEmpty()) { +// +// // il existe des echantillon faune a supprimer on demande une +// // confirmation +// StringBuilder sb = new StringBuilder(); +// StringBuilder sb2 = new StringBuilder(); +// Decorator<Species> decorator; +// Decorator<NonTargetLength> decorator2; +// decorator = getDecoratorService().getDecoratorByType(Species.class); +// decorator2 = getDecoratorService().getDecoratorByType(NonTargetLength.class); +// +// for (Species e : speciessToDelete) { +// sb.append(" - ").append(decorator.toString(e)).append('\n'); +// } +// for (NonTargetLength t : tailleToDelete) { +// sb2.append(" - ").append(decorator2.toString(t)).append('\n'); +// } +// int reponse = UIHelper.askUser( +// t("observe.title.need.confirm"), +// t("observe.nonTargetCatch.message.table.will.delete.nonTargetSample", sb.toString(), sb2.toString()), +// JOptionPane.ERROR_MESSAGE, +// new Object[]{ +// t("observe.choice.continue"), +// t("observe.choice.cancel")}, +// 0); +// if (log.isDebugEnabled()) { +// log.debug("response : " + reponse); +// } +// boolean canContinue = false; +// switch (reponse) { +// case 0: +// // wil reset ui +// canContinue = true; +// break; +// } +// if (!canContinue) { +// // l'utilisateur a choisi de ne pas continuer +// return false; +// } +// +// // on conserve les tailles a supprimer +// ALL_TAILLES_TO_DELETE_ENTRY.setContextValue(getUi(), tailleToDelete); +// } +// +// // mise a jour de la propriete nonTargetDiscarded +// +// boolean hasRejet = false; +// for (NonTargetCatch c : objets) { +// if (c.getReasonForDiscard() != null) { +// // on a trouve un rejet de faune +// hasRejet = true; +// break; +// } +// } +// editBean.setNonTargetDiscarded(hasRejet); +// +// return true; +// } + + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<NonTargetCatch> oldChilds) { +// +// List<NonTargetLength> tailleToDelete = +// ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); +// +// if (tailleToDelete != null && !tailleToDelete.isEmpty()) { +// +// // on a demande la suppression de taille obsoletes +// +// if (log.isInfoEnabled()) { +// log.info("Will remove " + tailleToDelete.size() + +// " obsolete nonTargetSample(s)."); +// } +// +// NonTargetSample echantillon = bean.getNonTargetSample().get(0); +// +// // on supprime les echantillons obsoletes +// echantillon.getNonTargetLength().removeAll(tailleToDelete); +// } +// } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css index bc9c1ef..cd9dd56 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css @@ -63,7 +63,7 @@ } #count { - property:{NonTargetLength.PROPERTY_COUNT}; + property:{NonTargetLengthDto.PROPERTY_COUNT}; model:{tableEditBean.getCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -73,10 +73,11 @@ labelFor:{sex}; } -#sex { - property:{NonTargetLength.PROPERTY_SEX}; - selectedItem:{tableEditBean.getSex()}; -} +//FIXME +//#sex { + //property:{NonTargetLengthDto.PROPERTY_SEX}; + //selectedItem:{tableEditBean.getSex()}; +//} #picturesReferencesLabel { text:"observe.common.picturesReferences"; @@ -85,12 +86,12 @@ #picturesReferences { text:{getStringValue(tableEditBean.getPicturesReferences())}; - _tablePropertyName:{NonTargetLength.PROPERTY_PICTURES_REFERENCES}; + _tablePropertyName:{NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES}; } #resetPicturesReferences{ toolTipText:"observe.action.reset.picturesReferences.tip"; - _resetTablePropertyName:{NonTargetLength.PROPERTY_PICTURES_REFERENCES}; + _resetTablePropertyName:{NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES}; } #speciesTypeTailleLabel{ @@ -101,7 +102,8 @@ #speciesTypeTaille { font-weight:"bold"; - text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; + //FIXME + //text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; } #comment { 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 66a6a8e..4ce2e2f 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 @@ -32,7 +32,7 @@ <style source="AbstractSampleUI.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.seine.NonTargetLengthDto @@ -98,7 +98,7 @@ public String getLengthDataTip(boolean computed) { return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); } -public String getSpeciesFauneTypeTaille(Species species) { +public String getSpeciesFauneTypeTaille(SpeciesDto species) { return species == null ? t("observe.message.no.species.selected") : species.getLengthMeasureType(); } ]]> @@ -124,7 +124,7 @@ public String getSpeciesFauneTypeTaille(Species species) { <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> @@ -186,7 +186,7 @@ public String getSpeciesFauneTypeTaille(Species species) { <JLabel id='sexLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='sex' genericType='Sex' constructorParams='this'/> + <BeanComboBox id='sex' genericType='SexDto' constructorParams='this'/> </cell> </row> 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 165dbbe..7455a33 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 @@ -21,12 +21,14 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; -import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +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; @@ -34,17 +36,12 @@ import fr.ird.observe.ui.content.table.ContentTableUIHandler; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JComponent; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -54,12 +51,12 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSample, NonTargetLength> { +public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSampleDto, NonTargetLengthDto> { /** Logger */ static private Log log = LogFactory.getLog(NonTargetSampleUIHandler.class); - protected final JAXXContextEntryDef<List<Species>> ALL_ESPECES_ENTRY = + protected final JAXXContextEntryDef<List<SpeciesDto>> ALL_ESPECES_ENTRY = UIHelper.newListContextEntryDef("NonTargetSampleUI-all-speciess"); /** @@ -72,7 +69,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam protected final PropertyChangeListener weightChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetLength source = (NonTargetLength) evt.getSource(); + NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); source.setWeightSource(false); } }; @@ -87,7 +84,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam protected final PropertyChangeListener lengthChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetLength source = (NonTargetLength) evt.getSource(); + NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); source.setLengthSource(false); } }; @@ -111,76 +108,78 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam getUi().getLength().grabFocus(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - String setId = dataContext.getSelectedSetId(); - // on doit récupérer l'unique échantillonThon de la calée - String id = dataService.getNonTargetSampleId(dataSource, setId); - return id; - } - - @Override - protected NonTargetSample loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - List<Species> speciess; - - String setId = dataContext.getSelectedSetId(); - - if (mode == ContentMode.UPDATE) { - - - speciess = dataService.getAvailableEspeceForNonTargetSample(dataSource, setId); - - } else { - speciess = new ArrayList<Species>(); - } - ALL_ESPECES_ENTRY.setContextValue(getUi(), speciess); - - // on doit récupérer l'unique échantillonThon de la calée - String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); - - NonTargetSample editBean = getBean(); - - if (log.isInfoEnabled()) { - log.info(prefix + " - set id : " + setId); - log.info(prefix + " - echantillon faune id : " + id); - log.info(prefix + " - edit bean id : " + editBean.getTopiaId()); - } - - if (id == null) { - - // l'échantillon n'existe pas encore, donc rien a faire - getLoadBinder().load(null, editBean, true); - - getModel().getChildsUpdator().setChilds(editBean, new ArrayList<NonTargetLength>()); - - } else { - - // preparation du bean d'édition - dataService.loadEditEntity(dataSource, id, getLoadExecutor()); - } - - getModel().setMode(mode); - - // initialisation du modèle du tableau - getUi().getTableModel().attachModel(); - - return editBean; - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// String setId = dataContext.getSelectedSetId(); +// // on doit récupérer l'unique échantillonThon de la calée +// String id = dataService.getNonTargetSampleId(dataSource, setId); +// return id; +// } + + //FIXME +// @Override +// protected NonTargetSample loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// List<Species> speciess; +// +// String setId = dataContext.getSelectedSetId(); +// +// if (mode == ContentMode.UPDATE) { +// +// +// speciess = dataService.getAvailableEspeceForNonTargetSample(dataSource, setId); +// +// } else { +// speciess = new ArrayList<Species>(); +// } +// ALL_ESPECES_ENTRY.setContextValue(getUi(), speciess); +// +// // on doit récupérer l'unique échantillonThon de la calée +// String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); +// +// NonTargetSample editBean = getBean(); +// +// if (log.isInfoEnabled()) { +// log.info(prefix + " - set id : " + setId); +// log.info(prefix + " - echantillon faune id : " + id); +// log.info(prefix + " - edit bean id : " + editBean.getTopiaId()); +// } +// +// if (id == null) { +// +// // l'échantillon n'existe pas encore, donc rien a faire +// getLoadBinder().load(null, editBean, true); +// +// getModel().getChildsUpdator().setChilds(editBean, new ArrayList<NonTargetLength>()); +// +// } else { +// +// // preparation du bean d'édition +// dataService.loadEditEntity(dataSource, id, getLoadExecutor()); +// } +// +// getModel().setMode(mode); +// +// // initialisation du modèle du tableau +// getUi().getTableModel().attachModel(); +// +// return editBean; +// } @Override - protected boolean prepareSave(NonTargetSample bean, List<NonTargetLength> objets) throws DataSourceException { + protected boolean prepareSave(NonTargetSampleDto bean, List<NonTargetLengthDto> objets) throws DataSourceException { boolean withLengths = !objets.isEmpty(); if (withLengths) { - if (bean.getTopiaId() == null) { + if (bean.getId() == null) { String setId = getDataContext().getSelectedSetId(); @@ -190,7 +189,8 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam log.debug("Will create nonTargetSample " + bean + " for " + setId); } - getDataService().create(getDataSource(), setId, bean, null, getCreateExecutor()); + //FIXME +// getDataService().create(getDataSource(), setId, bean, null, getCreateExecutor()); } @@ -200,69 +200,73 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam } - @Override - protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { - - if (bean.getTopiaId() != null && bean.isNonTargetLengthEmpty()) { - - // remove orphan non target sample - - String setId = getDataContext().getSelectedSetId(); - if (log.isInfoEnabled()) { - log.info("Remove obsolete nonTargetSample " + bean.getTopiaId() + " from Set: " + setId); - } - getDataService().delete(getDataSource(), setId, bean, getDeleteExecutor()); - - } else { - - // normal persist - super.doPersist(bean, dataService, dataSource); - - } - - } - - @Override - protected NonTargetSample onCreate(TopiaContext tx, - Object parent, - NonTargetSample editBean) throws TopiaException { - SetSeine parentBean = (SetSeine) parent; - NonTargetSample beanToSave = - ObserveDAOHelper.getNonTargetSampleDAO(tx).create(); - if (log.isInfoEnabled()) { - log.info("Echantillon faune " + beanToSave.getTopiaId() + - " was created."); - } - editBean.setTopiaId(beanToSave.getTopiaId()); - editBean.setTopiaCreateDate(beanToSave.getTopiaCreateDate()); - editBean.setTopiaVersion(beanToSave.getTopiaVersion()); - parentBean.addNonTargetSample(beanToSave); - return beanToSave; - } - - @Override - protected void onDelete(TopiaContext tx, Object parent, NonTargetSample beanToDelete) throws TopiaException { - SetSeine parentBean = (SetSeine) parent; - parentBean.removeNonTargetSample(beanToDelete); - } + //FIXME +// @Override +// protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// if (bean.getTopiaId() != null && bean.isNonTargetLengthEmpty()) { +// +// // remove orphan non target sample +// +// String setId = getDataContext().getSelectedSetId(); +// if (log.isInfoEnabled()) { +// log.info("Remove obsolete nonTargetSample " + bean.getTopiaId() + " from Set: " + setId); +// } +// getDataService().delete(getDataSource(), setId, bean, getDeleteExecutor()); +// +// } else { +// +// // normal persist +// super.doPersist(bean, dataService, dataSource); +// +// } +// +// } + + //FIXME +// @Override +// protected NonTargetSample onCreate(TopiaContext tx, +// Object parent, +// NonTargetSample editBean) throws TopiaException { +// SetSeine parentBean = (SetSeine) parent; +// NonTargetSample beanToSave = +// ObserveDAOHelper.getNonTargetSampleDAO(tx).create(); +// if (log.isInfoEnabled()) { +// log.info("Echantillon faune " + beanToSave.getTopiaId() + +// " was created."); +// } +// editBean.setTopiaId(beanToSave.getTopiaId()); +// editBean.setTopiaCreateDate(beanToSave.getTopiaCreateDate()); +// editBean.setTopiaVersion(beanToSave.getTopiaVersion()); +// parentBean.addNonTargetSample(beanToSave); +// return beanToSave; +// } + + //FIXME +// @Override +// protected void onDelete(TopiaContext tx, Object parent, NonTargetSample beanToDelete) throws TopiaException { +// SetSeine parentBean = (SetSeine) parent; +// parentBean.removeNonTargetSample(beanToDelete); +// } @SuppressWarnings("unchecked") @Override protected void onSelectedRowChanged(int editingRow, - NonTargetLength bean, + NonTargetLengthDto bean, boolean create) { - ContentTableModel<NonTargetSample, NonTargetLength> model = getTableModel(); + ContentTableModel<NonTargetSampleDto, NonTargetLengthDto> model = getTableModel(); if (!model.isEditable()) { return; } - Species species = bean.getSpecies(); +// SpeciesDto species = bean.getSpecies(); NonTargetSampleUI ui = getUi(); - if (log.isDebugEnabled()) { - log.debug("selected species " + species); - } - List<Species> availableEspeces; + //FIXME +// if (log.isDebugEnabled()) { +// log.debug("selected species " + species); +// } +// List<Species> availableEspeces; JComponent requestFocus; if (create) { @@ -274,8 +278,8 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam ui.getAcquisitionModeGroup().setSelectedValue(ModeSaisieEchantillonEnum.byEffectif); } - availableEspeces = new ArrayList<Species>( - ALL_ESPECES_ENTRY.getContextValue(ui)); +// availableEspeces = new ArrayList<Species>( +// ALL_ESPECES_ENTRY.getContextValue(ui)); requestFocus = ui.getSpecies(); } else { @@ -288,17 +292,17 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam ui.getAcquisitionModeGroup().setSelectedValue(null); ui.getAcquisitionModeGroup().setSelectedValue(enumValue); - availableEspeces = Arrays.asList(species); +// availableEspeces = Arrays.asList(species); } - ui.getSpecies().setData(availableEspeces); +// ui.getSpecies().setData(availableEspeces); requestFocus.requestFocus(); - NonTargetLength tableEditBean = getTableEditBean(); - tableEditBean.removePropertyChangeListener(NonTargetLength.PROPERTY_WEIGHT, weightChanged); - tableEditBean.addPropertyChangeListener(NonTargetLength.PROPERTY_WEIGHT, weightChanged); + NonTargetLengthDto tableEditBean = getTableEditBean(); + tableEditBean.removePropertyChangeListener(NonTargetLengthDto.PROPERTY_WEIGHT, weightChanged); + tableEditBean.addPropertyChangeListener(NonTargetLengthDto.PROPERTY_WEIGHT, weightChanged); - tableEditBean.removePropertyChangeListener(NonTargetLength.PROPERTY_LENGTH, lengthChanged); - tableEditBean.addPropertyChangeListener(NonTargetLength.PROPERTY_LENGTH, lengthChanged); + tableEditBean.removePropertyChangeListener(NonTargetLengthDto.PROPERTY_LENGTH, lengthChanged); + tableEditBean.addPropertyChangeListener(NonTargetLengthDto.PROPERTY_LENGTH, lengthChanged); } @Override @@ -323,11 +327,11 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam n("observe.nonTargetSample.table.picturesReferences"), n("observe.nonTargetSample.table.picturesReferences.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 4, UIHelper.newDecorateTableCellRenderer(renderer, Sex.class)); + UIHelper.setTableColumnRenderer(table, 4, UIHelper.newDecorateTableCellRenderer(renderer, SexDto.class)); UIHelper.setTableColumnRenderer(table, 5, renderer); } @@ -337,14 +341,15 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam boolean showData = false; - try { - String setId = getDataContext().getSelectedSetId(); - showData = getDataService().canUseNonTargetSample(getDataSource(), setId); - } catch (DataSourceException e) { - if (log.isErrorEnabled()) { - log.error(e); - } - } + //FIXME +// try { +// String setId = getDataContext().getSelectedSetId(); +// showData = getDataService().canUseNonTargetSample(getDataSource(), setId); +// } catch (DataSourceException e) { +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// } getUi().getModel().setShowData(showData); @@ -355,7 +360,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam addMessage(getUi(), NuitonValidatorScope.INFO, - getEntityLabel(SetSeine.class), + getEntityLabel(SetSeineDto.class), t("observe.setSeine.message.no.nonTargetDiscarded")); } return mode; @@ -382,7 +387,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam boolean createMode = ui.getTableModel().isCreate(); - NonTargetLength editBean = ui.getTableEditBean(); + NonTargetLengthDto editBean = ui.getTableEditBean(); switch (newMode) { case byEffectif: diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css index 2945cfe..3227180 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css @@ -26,7 +26,7 @@ } #species { - property:{ObjectObservedSpecies.PROPERTY_SPECIES}; + property:{ObjectObservedSpeciesDto.PROPERTY_SPECIES}; selectedItem:{tableEditBean.getSpecies()}; } @@ -36,7 +36,7 @@ } #speciesStatus { - property:{ObjectObservedSpecies.PROPERTY_SPECIES_STATUS}; + property:{ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS}; selectedItem:{tableEditBean.getSpeciesStatus()}; } @@ -46,7 +46,7 @@ } #count { - property:{ObjectObservedSpecies.PROPERTY_COUNT}; + property:{ObjectObservedSpeciesDto.PROPERTY_COUNT}; model:{tableEditBean.getCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } 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 ad302b5..a25c70c 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 @@ -31,11 +31,11 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto 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.services.dto.referential.seine.SpeciesStatusDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -85,7 +85,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='species' constructorParams='this' - genericType='Species'/> + genericType='SpeciesDto'/> </cell> </row> @@ -96,7 +96,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='speciesStatus' constructorParams='this' - genericType='SpeciesStatus'/> + genericType='SpeciesStatusDto'/> </cell> </row> 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 7351740..35d3ef9 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 @@ -21,17 +21,20 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +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; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -40,7 +43,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<FloatingObject, ObjectObservedSpecies> { +public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<FloatingObjectDto, ObjectObservedSpeciesDto> { /** Logger */ static private Log log = @@ -55,13 +58,14 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati return (ObjectObservedSpeciesUI) super.getUi(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedFloatingObjectId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedFloatingObjectId(); +// } @Override - protected void onSelectedRowChanged(int editingRow, ObjectObservedSpecies bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, ObjectObservedSpeciesDto bean, boolean create) { if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); } @@ -82,8 +86,8 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati n("observe.objectObservedSpecies.table.count"), n("observe.objectObservedSpecies.table.count.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesStatus.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesStatusDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css index 50c62d0..15d53f7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css @@ -26,7 +26,7 @@ } #species { - property:{ObjectSchoolEstimate.PROPERTY_SPECIES}; + property:{ObjectSchoolEstimateDto.PROPERTY_SPECIES}; selectedItem:{tableEditBean.getSpecies()}; } @@ -36,7 +36,7 @@ } #totalWeight { - property:{ObjectSchoolEstimate.PROPERTY_TOTAL_WEIGHT}; + property:{ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT}; model:{tableEditBean.getTotalWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } 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 194aafd..fc2bc4a 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 @@ -31,7 +31,7 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.FloatingObjectDto fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto fr.ird.observe.services.dto.referential.SpeciesDto @@ -84,7 +84,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='species' constructorParams='this' - genericType='Species'/> + genericType='SpeciesDto'/> </cell> </row> 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 97b0979..1051615 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 @@ -21,17 +21,19 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +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; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -40,7 +42,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<FloatingObject, ObjectSchoolEstimate> { +public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<FloatingObjectDto, ObjectSchoolEstimateDto> { /** Logger */ @@ -56,7 +58,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin } @Override - protected void onSelectedRowChanged(int editingRow, ObjectSchoolEstimate bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, ObjectSchoolEstimateDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); @@ -65,10 +67,11 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin } } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedFloatingObjectId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedFloatingObjectId(); +// } @Override protected void initTableUI(DefaultTableCellRenderer renderer) { @@ -80,7 +83,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin n("observe.schoolEstimate.table.weight"), n("observe.schoolEstimate.table.weight.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css index 2c0e711..b6cc3e0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css @@ -27,7 +27,7 @@ } #species { - property:{SchoolEstimate.PROPERTY_SPECIES}; + property:{SchoolEstimateDto.PROPERTY_SPECIES}; selectedItem:{tableEditBean.getSpecies()}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; } @@ -38,7 +38,7 @@ } #totalWeight { - property:{SchoolEstimate.PROPERTY_TOTAL_WEIGHT}; + property:{SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT}; model:{tableEditBean.getTotalWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_7_DIGITS_PATTERN}; } @@ -49,7 +49,7 @@ } #meanWeight { - property:{SchoolEstimate.PROPERTY_MEAN_WEIGHT}; + property:{SchoolEstimateDto.PROPERTY_MEAN_WEIGHT}; model:{tableEditBean.getMeanWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } 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 54dcfcc..1f18a7c 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 @@ -31,7 +31,7 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.seine.SchoolEstimateDto fr.ird.observe.services.dto.referential.SpeciesDto @@ -68,7 +68,8 @@ errorTableModel='{getErrorTableModel()}' context='n1-update-schoolEstimate'> <!-- clef unique --> - <field name="schoolEstimate" component="editorPanel"/> + <!--FIXME--> + <!--<field name="schoolEstimate" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> @@ -87,7 +88,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='Species' + <BeanComboBox id='species' genericType='SpeciesDto' constructorParams='this'/> </cell> </row> 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 844a269..c03b629 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 @@ -21,14 +21,15 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +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; @@ -50,12 +51,12 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, SchoolEstimate> { +public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineDto, SchoolEstimateDto> { /** Logger */ static private Log log = LogFactory.getLog(SchoolEstimateUIHandler.class); - JAXXContextEntryDef<List<Species>> ALL_ESPECES_ENTRY = + JAXXContextEntryDef<List<SpeciesDto>> ALL_ESPECES_ENTRY = UIHelper.newListContextEntryDef("SchoolEstimateUI-all-speciess"); public SchoolEstimateUIHandler(SchoolEstimateUI ui) { @@ -67,51 +68,53 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, Sch return (SchoolEstimateUI) super.getUi(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// List<Species> speciesList; +// +// if (mode == ContentMode.UPDATE) { +// +// // get current ocean +// Ocean ocean = dataService.getTripOcean( +// dataSource, dataContext.getSelectedTripId()); +// +// // get all species from the configured speciesList +// ObserveConfig config = getUi().getContextValue(ObserveConfig.class); +// String speciesListId = config.getSpeciesListSeineSchoolEstimateId(); +// +// List<Species> allSpecies = +// dataService.loadDecoratedSpecies(dataSource, speciesListId); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(allSpecies); +// +// // filtre par ocean +// speciesList = Species2.filterByOcean(allSpecies, ocean); +// +// } else { +// +// speciesList = new ArrayList<Species>(); +// } +// +// ALL_ESPECES_ENTRY.setContextValue(getUi(), speciesList); +// if (log.isDebugEnabled()) { +// log.debug("speciesList = " + speciesList.size()); +// } +// return super.loadEditBean(mode, dataContext, dataService, dataSource); +// } @Override - protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { - - List<Species> speciesList; - - if (mode == ContentMode.UPDATE) { - - // get current ocean - Ocean ocean = dataService.getTripOcean( - dataSource, dataContext.getSelectedTripId()); + protected void onSelectedRowChanged(int editingRow, SchoolEstimateDto bean, boolean create) { - // get all species from the configured speciesList - ObserveConfig config = getUi().getContextValue(ObserveConfig.class); - String speciesListId = config.getSpeciesListSeineSchoolEstimateId(); - - List<Species> allSpecies = - dataService.loadDecoratedSpecies(dataSource, speciesListId); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(allSpecies); - - // filtre par ocean - speciesList = Species2.filterByOcean(allSpecies, ocean); - - } else { - - speciesList = new ArrayList<Species>(); - } - - ALL_ESPECES_ENTRY.setContextValue(getUi(), speciesList); - if (log.isDebugEnabled()) { - log.debug("speciesList = " + speciesList.size()); - } - return super.loadEditBean(mode, dataContext, dataService, dataSource); - } - - @Override - protected void onSelectedRowChanged(int editingRow, SchoolEstimate bean, boolean create) { - - ContentTableModel<SetSeine, SchoolEstimate> model = getTableModel(); + ContentTableModel<SetSeineDto, SchoolEstimateDto> model = getTableModel(); if (!model.isEditable()) { @@ -120,24 +123,28 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, Sch } SchoolEstimateUI ui = getUi(); - List<Species> availableEspeces; + //FIXME +// List<Species> availableEspeces; JComponent requestFocus; if (create) { - availableEspeces = new ArrayList<Species>( - ALL_ESPECES_ENTRY.getContextValue(ui)); - - List<Species> list = model.getColumnValues(0); - availableEspeces.removeAll(list); - list.clear(); + //FIXME +// availableEspeces = new ArrayList<Species>( +// ALL_ESPECES_ENTRY.getContextValue(ui)); +// +// List<Species> list = model.getColumnValues(0); +// availableEspeces.removeAll(list); +// list.clear(); requestFocus = ui.getSpecies(); } else { - Species species = bean.getSpecies(); - availableEspeces = Arrays.asList(species); + //FIXME +// Species species = bean.getSpecies(); +// availableEspeces = Arrays.asList(species); requestFocus = ui.getTotalWeight(); } - ui.getSpecies().setData(availableEspeces); + //FIXME +// ui.getSpecies().setData(availableEspeces); requestFocus.requestFocus(); } @@ -154,18 +161,19 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, Sch n("observe.schoolEstimate.table.meanWeight"), n("observe.schoolEstimate.table.meanWeight.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } @Override - protected boolean prepareSave(SetSeine editBean, List<SchoolEstimate> objets) { + protected boolean prepareSave(SetSeineDto editBean, List<SchoolEstimateDto> objets) { - for (SchoolEstimate schoolEstimate : objets) { + for (SchoolEstimateDto schoolEstimate : objets) { // on attache la set - schoolEstimate.setSetSeine(editBean); + //FIXME +// schoolEstimate.setSetSeine(editBean); } return true; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css index 29d0bd1..8642bb4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css @@ -43,7 +43,7 @@ } #weightCategory { - property:{TargetCatch.PROPERTY_WEIGHT_CATEGORY}; + property:{TargetCatchDto.PROPERTY_WEIGHT_CATEGORY}; selectedItem:{tableEditBean.getWeightCategory()}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; } @@ -54,7 +54,7 @@ } #catchWeight { - property:{TargetCatch.PROPERTY_CATCH_WEIGHT}; + property:{TargetCatchDto.PROPERTY_CATCH_WEIGHT}; model:{tableEditBean.getCatchWeight()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; @@ -69,13 +69,13 @@ #resetWell { toolTipText:"observe.action.reset.well.tip"; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; - _resetTablePropertyName:{TargetCatch.PROPERTY_WELL}; + _resetTablePropertyName:{TargetCatchDto.PROPERTY_WELL}; } #well { text:{getStringValue(tableEditBean.getWell())}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; - _tablePropertyName:{TargetCatch.PROPERTY_WELL}; + _tablePropertyName:{TargetCatchDto.PROPERTY_WELL}; } #comment { 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 b299164..58888c1 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 @@ -31,10 +31,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto 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.seine.WeightCategoryDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.table.* @@ -68,7 +68,8 @@ errorTableModel='{getErrorTableModel()}' context='n1-update-targetCatch'> <!-- clef unique --> - <field name="targetCatch" component="editorPanel"/> + <!--FIXME--> + <!--<field name="targetCatch" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> @@ -87,7 +88,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='Species' constructorParams='this'/> + <BeanComboBox id='species' genericType='SpeciesDto' constructorParams='this'/> </cell> </row> @@ -98,7 +99,7 @@ <JLabel id='weightCategoryLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='weightCategory' genericType='WeightCategory' constructorParams='this'/> + <BeanComboBox id='weightCategory' genericType='WeightCategoryDto' constructorParams='this'/> </cell> </row> 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 cf8ea4e..6b26d43 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 @@ -21,16 +21,17 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.business.util.TopiaExecutor; -import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +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.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -42,10 +43,6 @@ import org.apache.commons.collections.CollectionUtils; 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.util.TopiaEntityBinder; import javax.swing.JComponent; import javax.swing.JOptionPane; @@ -68,27 +65,28 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, TargetCatch> { +public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, TargetCatchDto> { /** Logger */ private static final Log log = LogFactory.getLog(TargetCatchUIHandler.class); - JAXXContextEntryDef<List<TargetLength>> ALL_TAILLES_TO_DELETE_ENTRY = + JAXXContextEntryDef<List<TargetLengthDto>> ALL_TAILLES_TO_DELETE_ENTRY = UIHelper.newListContextEntryDef("TargetCatchUI-all-taille-to-delete"); /** * l'entrée dans le contexte pour récupérer la liste complètes des * catégories */ - JAXXContextEntryDef<List<WeightCategory>> ALL_CATEGORIES_ENTRY = + JAXXContextEntryDef<List<WeightCategoryDto>> ALL_CATEGORIES_ENTRY = UIHelper.newListContextEntryDef("TargetCatchUI-all-categories"); - TopiaExecutor<WeightCategory> weightCategoryTopiaExecutor = new TopiaExecutor<WeightCategory>() { - @Override - public void execute(TopiaContext tx, WeightCategory bean) { - getDecoratorService().decorate(bean.getSpecies()); - } - }; + //FIXME +// TopiaExecutor<WeightCategory> weightCategoryTopiaExecutor = new TopiaExecutor<WeightCategory>() { +// @Override +// public void execute(TopiaContext tx, WeightCategory bean) { +// getDecoratorService().decorate(bean.getSpecies()); +// } +// }; public TargetCatchUIHandler(TargetCatchUI ui) { super(ui, DataContextType.SetSeine); @@ -114,15 +112,15 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target @Override public void propertyChange(PropertyChangeEvent evt) { - ContentTableModel<SetSeine, TargetCatch> model; + ContentTableModel<SetSeineDto, TargetCatchDto> model; model = getTableModel(); - if (model.getRowBean().getTopiaId() == null) { + if (model.getRowBean().getId() == null) { // en mode creation , on doit recalculer la liste // des categories - Species species = (Species) evt.getNewValue(); + SpeciesDto species = (SpeciesDto) evt.getNewValue(); onEspeceChanged(species); @@ -132,131 +130,134 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target ); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + +// @Override +// protected SetSeine loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// List<Species> speciesList; +// List<WeightCategory> categorieList; +// +// if (mode == ContentMode.UPDATE) { +// +// // on charge le formulaire uniquement si en mode édition +// +// categorieList = new ArrayList<WeightCategory>( +// dataService.loadDecoratedEntities(dataSource, +// WeightCategory.class, +// weightCategoryTopiaExecutor)); +// +// // Keep only weight categories for the species +// ObserveConfig config = getUi().getContextValue(ObserveConfig.class); +// String speciesListId = config.getSpeciesListSeineTargetCatchId(); +// +// java.util.Set<String> speciesIds = loadSpeciesList(speciesListId, n("observe.error.speciesList.seine.targetCatch.notFound")); +// +// categorieList = Species2.filterWeightCategoryBySpeciesIds( +// categorieList, speciesIds); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(categorieList); +// +// // get current ocean +// Ocean ocean = dataService.getTripOcean( +// dataSource, dataContext.getSelectedTripId()); +// +// // filtre par ocean +// categorieList = Species2.filterWeightCategoryByOcean(categorieList, ocean); +// +// // filtre par ocean +// speciesList = Species2.toSpecies(categorieList); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(speciesList); +// +// } else { +// +// speciesList = new ArrayList<Species>(); +// categorieList = new ArrayList<WeightCategory>(); +// } +// +// TargetCatchUI ui = getUi(); +// +// ALL_CATEGORIES_ENTRY.setContextValue(ui, categorieList); +// +// ui.getSpecies().setData(speciesList); +// +// return super.loadEditBean(mode, dataContext, dataService, dataSource); +// } + +// @Override +// protected Collection<TargetCatch> loadChilds(TopiaContext tx, SetSeine bean) throws TopiaException { +// Collection<TargetCatch> childs = getModel().getChildsUpdator().getChilds(bean); +// Collection<TargetCatch> data = new ArrayList<TargetCatch>(); +// if (CollectionUtils.isNotEmpty(childs)) { +// TopiaDAO<TargetCatch> dao = +// getDataSource().getDAO(tx, getTableEditBean()); +// TopiaEntityBinder<TargetCatch> childLoador = getModel().getChildLoador(); +// +// DecoratorService decoratorService = getDecoratorService(); +// +// for (TargetCatch c : childs) { +// if (c.isDiscarded()) { +// // c'est un rejet, on ne le retient pas dans cette liste +// if (log.isDebugEnabled()) { +// log.debug("targetDiscarded " + c.getSpecies().getLabel2() + +// " non retenu."); +// } +// continue; +// } +// try { +// +// TargetCatch c2 = getModel().newTableEditBean(); +// TargetCatch safeC = dao.findByTopiaId(c.getTopiaId()); +// WeightCategory weightCategory = safeC.getWeightCategory(); +// if (weightCategory != null) { +// Species species = weightCategory.getSpecies(); +// decoratorService.decorate(species); +// } +// childLoador.load(safeC, c2, true); +// data.add(c2); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } +// } +// return data; +// } @Override - protected SetSeine loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - List<Species> speciesList; - List<WeightCategory> categorieList; - - if (mode == ContentMode.UPDATE) { - - // on charge le formulaire uniquement si en mode édition - - categorieList = new ArrayList<WeightCategory>( - dataService.loadDecoratedEntities(dataSource, - WeightCategory.class, - weightCategoryTopiaExecutor)); - - // Keep only weight categories for the species - ObserveConfig config = getUi().getContextValue(ObserveConfig.class); - String speciesListId = config.getSpeciesListSeineTargetCatchId(); - - java.util.Set<String> speciesIds = loadSpeciesList(speciesListId, n("observe.error.speciesList.seine.targetCatch.notFound")); - - categorieList = Species2.filterWeightCategoryBySpeciesIds( - categorieList, speciesIds); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(categorieList); - - // get current ocean - Ocean ocean = dataService.getTripOcean( - dataSource, dataContext.getSelectedTripId()); - - // filtre par ocean - categorieList = Species2.filterWeightCategoryByOcean(categorieList, ocean); - - // filtre par ocean - speciesList = Species2.toSpecies(categorieList); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(speciesList); - - } else { - - speciesList = new ArrayList<Species>(); - categorieList = new ArrayList<WeightCategory>(); - } - - TargetCatchUI ui = getUi(); - - ALL_CATEGORIES_ENTRY.setContextValue(ui, categorieList); - - ui.getSpecies().setData(speciesList); - - return super.loadEditBean(mode, dataContext, dataService, dataSource); - } - - @Override - protected Collection<TargetCatch> loadChilds(TopiaContext tx, SetSeine bean) throws TopiaException { - Collection<TargetCatch> childs = getModel().getChildsUpdator().getChilds(bean); - Collection<TargetCatch> data = new ArrayList<TargetCatch>(); - if (CollectionUtils.isNotEmpty(childs)) { - TopiaDAO<TargetCatch> dao = - getDataSource().getDAO(tx, getTableEditBean()); - TopiaEntityBinder<TargetCatch> childLoador = getModel().getChildLoador(); - - DecoratorService decoratorService = getDecoratorService(); - - for (TargetCatch c : childs) { - if (c.isDiscarded()) { - // c'est un rejet, on ne le retient pas dans cette liste - if (log.isDebugEnabled()) { - log.debug("targetDiscarded " + c.getSpecies().getLabel2() + - " non retenu."); - } - continue; - } - try { - - TargetCatch c2 = getModel().newTableEditBean(); - TargetCatch safeC = dao.findByTopiaId(c.getTopiaId()); - WeightCategory weightCategory = safeC.getWeightCategory(); - if (weightCategory != null) { - Species species = weightCategory.getSpecies(); - decoratorService.decorate(species); - } - childLoador.load(safeC, c2, true); - data.add(c2); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - return data; - } - - @Override - protected boolean prepareSave(SetSeine bean, List<TargetCatch> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetCatch - Collection<Species> speciessUsed = new HashSet<Species>(); - for (TargetCatch c : objets) { - speciessUsed.add(c.getSpecies()); - } + Collection<SpeciesDto> speciessUsed = new HashSet<SpeciesDto>(); + //FIXME +// for (TargetCatchDto c : objets) { +// speciessUsed.add(c.getSpecies()); +// } // il faut supprimer les echantillon thons sur des speciess qui ne // sont plus sur un rejet - List<TargetLength> tailleToDelete = new ArrayList<TargetLength>(); - Collection<Species> speciessToDelete = new HashSet<Species>(); + List<TargetLengthDto> tailleToDelete = new ArrayList<TargetLengthDto>(); + Collection<SpeciesDto> speciessToDelete = new HashSet<SpeciesDto>(); - getDataService().getObsoleteEspeceForTargetSample(getDataSource(), - bean.getTopiaId(), - speciessUsed, - speciessToDelete, - tailleToDelete, - false); + //FIXME +// getDataService().getObsoleteEspeceForTargetSample(getDataSource(), +// bean.getTopiaId(), +// speciessUsed, +// speciessToDelete, +// tailleToDelete, +// false); if (!tailleToDelete.isEmpty()) { @@ -264,15 +265,15 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target // confirmation StringBuilder sb = new StringBuilder(512); StringBuilder sb2 = new StringBuilder(512); - Decorator<Species> decorator = - getDecoratorService().getDecoratorByType(Species.class); - Decorator<TargetLength> decorator2 = - getDecoratorService().getDecoratorByType(TargetLength.class); + Decorator<SpeciesDto> decorator = + getDecoratorService().getDecoratorByType(SpeciesDto.class); + Decorator<TargetLengthDto> decorator2 = + getDecoratorService().getDecoratorByType(TargetLengthDto.class); - for (Species e : speciessToDelete) { + for (SpeciesDto e : speciessToDelete) { sb.append(" - ").append(decorator.toString(e)).append('\n'); } - for (TargetLength t : tailleToDelete) { + for (TargetLengthDto t : tailleToDelete) { sb2.append(" - ").append(decorator2.toString(t)).append('\n'); } int reponse = UIHelper.askUser( @@ -304,54 +305,57 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target ALL_TAILLES_TO_DELETE_ENTRY.setContextValue(getUi(), tailleToDelete); } - for (TargetCatch targetCatch : objets) { + for (TargetCatchDto targetCatch : objets) { // on attache la set - targetCatch.setSetSeine(bean); + //FIXME +// targetCatch.setSetSeine(bean); } return true; } - @Override - protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<TargetCatch> oldChilds) { - - if (oldChilds != null && !oldChilds.isEmpty()) { - - // on reinjecte les rejet thon precedemment saisie dans la set - for (TargetCatch targetCatch : oldChilds) { - if (targetCatch.isDiscarded()) { - bean.addTargetCatch(targetCatch); - } - } - } - - - List<TargetLength> tailleToDelete = ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); - - if (tailleToDelete != null && !tailleToDelete.isEmpty()) { - - // on a demande la suppression de taille obsoletes - - if (log.isInfoEnabled()) { - log.info("Will remove " + tailleToDelete.size() + - " obsolete targetLength(s)."); - } - - TargetSample echantillon = bean.getTargetSample(false); - - // on supprime les echantillons obsoletes - echantillon.getTargetLength().removeAll(tailleToDelete); - } - } + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<TargetCatch> oldChilds) { +// +// if (oldChilds != null && !oldChilds.isEmpty()) { +// +// // on reinjecte les rejet thon precedemment saisie dans la set +// for (TargetCatch targetCatch : oldChilds) { +// if (targetCatch.isDiscarded()) { +// bean.addTargetCatch(targetCatch); +// } +// } +// } +// +// +// List<TargetLength> tailleToDelete = ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); +// +// if (tailleToDelete != null && !tailleToDelete.isEmpty()) { +// +// // on a demande la suppression de taille obsoletes +// +// if (log.isInfoEnabled()) { +// log.info("Will remove " + tailleToDelete.size() + +// " obsolete targetLength(s)."); +// } +// +// TargetSample echantillon = bean.getTargetSample(false); +// +// // on supprime les echantillons obsoletes +// echantillon.getTargetLength().removeAll(tailleToDelete); +// } +// } @Override - protected void onSelectedRowChanged(int editingRow, TargetCatch bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, TargetCatchDto bean, boolean create) { TargetCatchUI ui = getUi(); - WeightCategory beanWeightCategory = bean.getWeightCategory(); - Species beanEspece = beanWeightCategory == null ? - null : beanWeightCategory.getSpecies(); + //FIXME +// WeightCategoryDto beanWeightCategory = bean.getWeightCategory(); +// SpeciesDto beanEspece = beanWeightCategory == null ? +// null : beanWeightCategory.getSpecies(); JComponent requestFocus; if (create) { @@ -363,9 +367,11 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target if (!getTableModel().isCreate()) { // on repositionne l'species (cela reconstruira la liste // des categories) - ui.getSpecies().setSelectedItem(beanEspece); + //FIXME +// ui.getSpecies().setSelectedItem(beanEspece); // on repositionne la categorie - ui.getWeightCategory().setSelectedItem(beanWeightCategory); + //FIXME +// ui.getWeightCategory().setSelectedItem(beanWeightCategory); } requestFocus = ui.getSpecies(); @@ -376,17 +382,20 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target // au singleton de sa valeur correspondante dans le bean // puisque dans ce mode, pas possibilite de modifier de cette // valeur (clef metier) - ui.getSpecies().setSelectedItem(beanEspece); - ui.getWeightCategory().setData( - Arrays.asList(beanWeightCategory)); - ui.getWeightCategory().setSelectedItem(beanWeightCategory); + //FIXME +// ui.getSpecies().setSelectedItem(beanEspece); + //FIXME +// ui.getWeightCategory().setData( +// Arrays.asList(beanWeightCategory)); +// ui.getWeightCategory().setSelectedItem(beanWeightCategory); requestFocus = ui.getCatchWeight(); } if (log.isDebugEnabled()) { - log.debug("selected categoriePoid " + beanWeightCategory); - log.debug("selected species " + beanEspece); + //FIXME +// log.debug("selected categoriePoid " + beanWeightCategory); +// log.debug("selected species " + beanEspece); } requestFocus.requestFocus(); } @@ -413,17 +422,17 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target n("observe.targetCatch.table.comment"), n("observe.targetCatch.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, WeightCategory.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, WeightCategoryDto.class)); UIHelper.setTableColumnRenderer(table, 2, renderer); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } @SuppressWarnings("unchecked") - protected void onEspeceChanged(Species species) { + protected void onEspeceChanged(SpeciesDto species) { - List<WeightCategory> availableCategories; + List<WeightCategoryDto> availableCategories; if (species == null) { @@ -440,9 +449,9 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target availableCategories = getAllCategories(getUi()); // on ne conserve que les categories de l'species - for (Iterator<WeightCategory> it = availableCategories.iterator(); + for (Iterator<WeightCategoryDto> it = availableCategories.iterator(); it.hasNext(); ) { - WeightCategory weighte = it.next(); + WeightCategoryDto weighte = it.next(); if (!species.equals(weighte.getSpecies())) { it.remove(); } @@ -450,15 +459,15 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target } // on met a jour la liste des categories disponibles - BeanComboBox<WeightCategory> combo = getUi().getWeightCategory(); + BeanComboBox<WeightCategoryDto> combo = getUi().getWeightCategory(); combo.setData(availableCategories); // on reinitialise toujours la categorie selectionnee combo.setSelectedItem(null); } - protected List<WeightCategory> getAllCategories(JAXXContext context) { - List<WeightCategory> list = new ArrayList<WeightCategory>( + protected List<WeightCategoryDto> getAllCategories(JAXXContext context) { + List<WeightCategoryDto> list = new ArrayList<WeightCategoryDto>( ALL_CATEGORIES_ENTRY.getContextValue(context)); return list; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css index bcaa6a1..52b181d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css @@ -43,7 +43,7 @@ } #weightCategory { - property:{TargetCatch.PROPERTY_WEIGHT_CATEGORY}; + property:{TargetCatchDto.PROPERTY_WEIGHT_CATEGORY}; selectedItem:{tableEditBean.getWeightCategory()}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; } @@ -55,7 +55,7 @@ } #reasonForDiscard { - property:{TargetCatch.PROPERTY_REASON_FOR_DISCARD}; + property:{TargetCatchDto.PROPERTY_REASON_FOR_DISCARD}; selectedItem:{tableEditBean.getReasonForDiscard()}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; } @@ -66,7 +66,7 @@ } #catchWeight { - property:{TargetCatch.PROPERTY_CATCH_WEIGHT}; + property:{TargetCatchDto.PROPERTY_CATCH_WEIGHT}; model:{tableEditBean.getCatchWeight()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; @@ -87,7 +87,7 @@ #broughtOnDeck { booleanValue:{tableEditBean.getBroughtOnDeck()}; - _tablePropertyName:{TargetCatch.PROPERTY_BROUGHT_ON_DECK}; + _tablePropertyName:{TargetCatchDto.PROPERTY_BROUGHT_ON_DECK}; } #comment { 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 6311f9a..b317236 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 @@ -31,12 +31,12 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto 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.seine.WeightCategoryDto fr.ird.observe.services.dto.referential.SpeciesDto - fr.ird.observe.services.dto.referential.seine.ReasonForDiscard + fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.ui.content.table.* fr.ird.observe.ui.util.BooleanEditor @@ -70,7 +70,8 @@ errorTableModel='{getErrorTableModel()}' context='n1-update-targetDiscarded'> <!-- clef unique --> - <field name="targetCatch" component="editorPanel"/> + <!--FIXME--> + <!--<field name="targetCatch" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> @@ -88,7 +89,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> @@ -98,7 +99,7 @@ <JLabel id='weightCategoryLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='weightCategory' constructorParams='this' genericType='WeightCategory'/> + <BeanComboBox id='weightCategory' constructorParams='this' genericType='WeightCategoryDto'/> </cell> </row> @@ -108,7 +109,7 @@ <JLabel id='reasonForDiscardLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReasonForDiscard'/> + <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReasonForDiscardDto'/> </cell> </row> 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 c5068b1..c106650 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 @@ -21,16 +21,18 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.business.util.TopiaExecutor; -import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +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.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -42,10 +44,6 @@ import org.apache.commons.collections.CollectionUtils; 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.util.TopiaEntityBinder; import javax.swing.JComponent; import javax.swing.JOptionPane; @@ -68,51 +66,53 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, TargetCatch> { +public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineDto, TargetCatchDto> { /** Logger */ static private Log log = LogFactory.getLog(TargetDiscardCatchUIHandler.class); - JAXXContextEntryDef<List<WeightCategory>> ALL_CATEGORIES_ENTRY = + JAXXContextEntryDef<List<WeightCategoryDto>> ALL_CATEGORIES_ENTRY = UIHelper.newListContextEntryDef("RejetThonUI-all-categories"); - JAXXContextEntryDef<List<ReasonForDiscard>> ALL_RAISONS_REJET_ENTRY = + JAXXContextEntryDef<List<ReasonForDiscardDto>> ALL_RAISONS_REJET_ENTRY = UIHelper.newListContextEntryDef("RejetThonUI-all-reasonForDiscards"); - JAXXContextEntryDef<List<TargetLength>> ALL_TAILLES_TO_DELETE_ENTRY = + JAXXContextEntryDef<List<TargetLengthDto>> ALL_TAILLES_TO_DELETE_ENTRY = UIHelper.newListContextEntryDef("RejetThonUI-all-taille-to-delete"); - TopiaExecutor<WeightCategory> weightCategoryTopiaExecutor = new TopiaExecutor<WeightCategory>() { - @Override - public void execute(TopiaContext tx, WeightCategory bean) { - getDecoratorService().decorate(bean.getSpecies()); - } - }; + //FIXME +// TopiaExecutor<WeightCategoryDto> weightCategoryTopiaExecutor = new TopiaExecutor<WeightCategoryDto>() { +// @Override +// public void execute(TopiaContext tx, WeightCategory bean) { +// getDecoratorService().decorate(bean.getSpecies()); +// } +// }; public TargetDiscardCatchUIHandler(TargetDiscardCatchUI ui) { super(ui, DataContextType.SetSeine); } - protected static Collection<WeightCategory> getWeightCategoryUsed( - ContentTableModel<SetSeine, TargetCatch> model) { - List<WeightCategory> list = model.getColumnValues(1); - Collection<WeightCategory> set = new HashSet<WeightCategory>(list); + protected static Collection<WeightCategoryDto> getWeightCategoryUsed( + ContentTableModel<SetSeineDto, TargetCatchDto> model) { + List<WeightCategoryDto> list = model.getColumnValues(1); + Collection<WeightCategoryDto> set = new HashSet<WeightCategoryDto>(list); list.clear(); return set; } - protected static Collection<ReasonForDiscard> getReasonForDiscardUsed( - ContentTableModel<SetSeine, TargetCatch> model, - WeightCategory weightCategory) { + protected static Collection<ReasonForDiscardDto> getReasonForDiscardUsed( + ContentTableModel<SetSeineDto, TargetCatchDto> model, + WeightCategoryDto weightCategory) { - Collection<ReasonForDiscard> set = new HashSet<ReasonForDiscard>(); + Collection<ReasonForDiscardDto> set = new HashSet<ReasonForDiscardDto>(); if (weightCategory != null) { for (int i = 0; i < model.getRowCount(); i++) { - TargetCatch c = model.getValueAt(i); + TargetCatchDto c = model.getValueAt(i); if (c != null && weightCategory.equals(c.getWeightCategory()) && c.getReasonForDiscard() != null) { - set.add(c.getReasonForDiscard()); + //FIXME +// set.add(c.getReasonForDiscard()); } } } @@ -142,15 +142,15 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, @Override public void propertyChange(PropertyChangeEvent evt) { - ContentTableModel<SetSeine, TargetCatch> model = + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); - TargetCatch bean = model.getRowBean(); + TargetCatchDto bean = model.getRowBean(); - if (bean.getTopiaId() == null) { + if (bean.getId() == null) { // en mode creation , on doit recalculer la liste // des categories - Species species = (Species) evt.getNewValue(); + SpeciesDto species = (SpeciesDto) evt.getNewValue(); onEspeceChanged(bean, species); } } @@ -168,14 +168,14 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, @Override public void propertyChange(PropertyChangeEvent evt) { - ContentTableModel<SetSeine, TargetCatch> model = + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); - TargetCatch bean = model.getRowBean(); - if (bean.getTopiaId() == null) { + TargetCatchDto bean = model.getRowBean(); + if (bean.getId() == null) { // en mode creation , on doit recalculer la liste // des raison rejet - WeightCategory weightCategory = - (WeightCategory) evt.getNewValue(); + WeightCategoryDto weightCategory = + (WeightCategoryDto) evt.getNewValue(); onCategorieChanged(bean, weightCategory); } @@ -185,143 +185,149 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// protected SetSeine loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// List<WeightCategory> categorieList; +// List<ReasonForDiscard> reasonForDiscardList; +// +// if (mode == ContentMode.UPDATE) { +// +// // on charge le formulaire uniquement si en mode édition +// +// categorieList = new ArrayList<WeightCategory>( +// dataService.loadDecoratedEntities( +// dataSource, +// WeightCategory.class, +// weightCategoryTopiaExecutor) +// ); +// +// // filtre sur la liste d'espèce configuree +// ObserveConfig config = getUi().getContextValue(ObserveConfig.class); +// String speciesListId = config.getSpeciesListSeineTargetCatchId(); +// java.util.Set<String> speciesIds = loadSpeciesList(speciesListId, n("observe.error.speciesList.seine.targetCatch.notFound")); +// +// categorieList = Species2.filterWeightCategoryBySpeciesIds( +// categorieList, speciesIds); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(categorieList); +// +// // get current ocean +// Ocean ocean = dataService.getTripOcean(dataSource, dataContext.getSelectedTripId()); +// +// // filtre par ocean +// categorieList = Species2.filterWeightCategoryByOcean(categorieList, ocean); +// +// reasonForDiscardList = new ArrayList<ReasonForDiscard>( +// dataService.loadDecoratedEntities(dataSource, ReasonForDiscard.class)); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(reasonForDiscardList); +// +// } else { +// +// categorieList = new ArrayList<WeightCategory>(); +// reasonForDiscardList = new ArrayList<ReasonForDiscard>(); +// } +// +// TargetDiscardCatchUI ui = getUi(); +// +// ALL_CATEGORIES_ENTRY.setContextValue(ui, categorieList); +// ALL_RAISONS_REJET_ENTRY.setContextValue(ui, reasonForDiscardList); +// +// return super.loadEditBean(mode, dataContext, dataService, dataSource); +// } + + //FIXME +// @Override +// protected Collection<TargetCatch> loadChilds(TopiaContext tx, SetSeine bean) throws TopiaException { +// Collection<TargetCatch> childs = getModel().getChildsUpdator().getChilds(bean); +// Collection<TargetCatch> data = new ArrayList<TargetCatch>(); +// if (CollectionUtils.isNotEmpty(childs)) { +// TopiaDAO<TargetCatch> dao = +// getDataSource().getDAO(tx, getTableEditBean()); +// TopiaEntityBinder<TargetCatch> childLoador = getModel().getChildLoador(); +// DecoratorService decoratorService = getDecoratorService(); +// for (TargetCatch c : childs) { +// if (!c.isDiscarded()) { +// // ce n'est pas un rejet, on ne le retient pas dans cette +// // liste +// if (log.isDebugEnabled()) { +// log.debug("targetCatch " + c.getSpecies().getLabel2() + " non retenu."); +// } +// continue; +// } +// try { +// TargetCatch c2 = getModel().newTableEditBean(); +// TargetCatch safeC = dao.findByTopiaId(c.getTopiaId()); +// WeightCategory weightCategory = safeC.getWeightCategory(); +// if (weightCategory != null) { +// Species species = weightCategory.getSpecies(); +// decoratorService.decorate(species); +// } +// childLoador.load(safeC, c2, true); +// data.add(c2); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } +// } +// return data; +// } + + //FIXME +// @Override +// protected boolean doSave(SetSeine bean, +// DataService dataService, +// DataSource dataSource, +// TopiaEntityBinder<SetSeine> binder) throws Exception { +// try { +// return super.doSave(bean, dataService, dataSource, binder); +// } finally { +// +// // toujours supprimer la référence du context, quoiqu'il arrive +// ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); +// } +// } @Override - protected SetSeine loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - List<WeightCategory> categorieList; - List<ReasonForDiscard> reasonForDiscardList; - - if (mode == ContentMode.UPDATE) { - - // on charge le formulaire uniquement si en mode édition - - categorieList = new ArrayList<WeightCategory>( - dataService.loadDecoratedEntities( - dataSource, - WeightCategory.class, - weightCategoryTopiaExecutor) - ); - - // filtre sur la liste d'espèce configuree - ObserveConfig config = getUi().getContextValue(ObserveConfig.class); - String speciesListId = config.getSpeciesListSeineTargetCatchId(); - java.util.Set<String> speciesIds = loadSpeciesList(speciesListId, n("observe.error.speciesList.seine.targetCatch.notFound")); - - categorieList = Species2.filterWeightCategoryBySpeciesIds( - categorieList, speciesIds); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(categorieList); - - // get current ocean - Ocean ocean = dataService.getTripOcean(dataSource, dataContext.getSelectedTripId()); - - // filtre par ocean - categorieList = Species2.filterWeightCategoryByOcean(categorieList, ocean); - - reasonForDiscardList = new ArrayList<ReasonForDiscard>( - dataService.loadDecoratedEntities(dataSource, ReasonForDiscard.class)); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(reasonForDiscardList); - - } else { - - categorieList = new ArrayList<WeightCategory>(); - reasonForDiscardList = new ArrayList<ReasonForDiscard>(); - } - - TargetDiscardCatchUI ui = getUi(); - - ALL_CATEGORIES_ENTRY.setContextValue(ui, categorieList); - ALL_RAISONS_REJET_ENTRY.setContextValue(ui, reasonForDiscardList); - - return super.loadEditBean(mode, dataContext, dataService, dataSource); - } - - @Override - protected Collection<TargetCatch> loadChilds(TopiaContext tx, SetSeine bean) throws TopiaException { - Collection<TargetCatch> childs = getModel().getChildsUpdator().getChilds(bean); - Collection<TargetCatch> data = new ArrayList<TargetCatch>(); - if (CollectionUtils.isNotEmpty(childs)) { - TopiaDAO<TargetCatch> dao = - getDataSource().getDAO(tx, getTableEditBean()); - TopiaEntityBinder<TargetCatch> childLoador = getModel().getChildLoador(); - DecoratorService decoratorService = getDecoratorService(); - for (TargetCatch c : childs) { - if (!c.isDiscarded()) { - // ce n'est pas un rejet, on ne le retient pas dans cette - // liste - if (log.isDebugEnabled()) { - log.debug("targetCatch " + c.getSpecies().getLabel2() + " non retenu."); - } - continue; - } - try { - TargetCatch c2 = getModel().newTableEditBean(); - TargetCatch safeC = dao.findByTopiaId(c.getTopiaId()); - WeightCategory weightCategory = safeC.getWeightCategory(); - if (weightCategory != null) { - Species species = weightCategory.getSpecies(); - decoratorService.decorate(species); - } - childLoador.load(safeC, c2, true); - data.add(c2); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - return data; - } - - @Override - protected boolean doSave(SetSeine bean, - DataService dataService, - DataSource dataSource, - TopiaEntityBinder<SetSeine> binder) throws Exception { - try { - return super.doSave(bean, dataService, dataSource, binder); - } finally { - - // toujours supprimer la référence du context, quoiqu'il arrive - ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); - } - } - - @Override - protected boolean prepareSave(SetSeine bean, List<TargetCatch> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetDiscarded montee sur le pont - java.util.Set<Species> speciessUsed = new HashSet<Species>(); - for (TargetCatch c : objets) { + java.util.Set<SpeciesDto> speciessUsed = new HashSet<SpeciesDto>(); + for (TargetCatchDto c : objets) { if (c.getBroughtOnDeck() != null && c.getBroughtOnDeck()) { - speciessUsed.add(c.getSpecies()); + //FIXME +// speciessUsed.add(c.getSpecies()); } } // il faut supprimer les echantillon thons sur des speciess qui ne // sont plus sur un rejet - List<TargetLength> tailleToDelete = new ArrayList<TargetLength>(); - java.util.Set<Species> speciessToDelete = new HashSet<Species>(); + List<TargetLengthDto> tailleToDelete = new ArrayList<TargetLengthDto>(); + java.util.Set<SpeciesDto> speciessToDelete = new HashSet<SpeciesDto>(); - getDataService().getObsoleteEspeceForTargetSample(getDataSource(), - bean.getTopiaId(), - speciessUsed, - speciessToDelete, - tailleToDelete, - true); + //FIXME +// getDataService().getObsoleteEspeceForTargetSample(getDataSource(), +// bean.getTopiaId(), +// speciessUsed, +// speciessToDelete, +// tailleToDelete, +// true); if (!tailleToDelete.isEmpty()) { @@ -329,15 +335,15 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // confirmation StringBuilder sb = new StringBuilder(512); StringBuilder sb2 = new StringBuilder(512); - Decorator<Species> decorator = - getDecoratorService().getDecoratorByType(Species.class); - Decorator<TargetLength> decorator2 = - getDecoratorService().getDecoratorByType(TargetLength.class); + Decorator<SpeciesDto> decorator = + getDecoratorService().getDecoratorByType(SpeciesDto.class); + Decorator<TargetLengthDto> decorator2 = + getDecoratorService().getDecoratorByType(TargetLengthDto.class); - for (Species e : speciessToDelete) { + for (SpeciesDto e : speciessToDelete) { sb.append(" - ").append(decorator.toString(e)).append('\n'); } - for (TargetLength t : tailleToDelete) { + for (TargetLengthDto t : tailleToDelete) { sb2.append(" - ").append(decorator2.toString(t)).append('\n'); } int reponse = UIHelper.askUser( @@ -372,68 +378,71 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // mise a jour de la propriete targetDiscarded bean.setTargetDiscarded(!objets.isEmpty()); - for (TargetCatch discarded : objets) { + for (TargetCatchDto discarded : objets) { // FIXME : on devrait pas a avoir a repositionner la propriete discarded discarded.setDiscarded(true); // on attache la set - discarded.setSetSeine(bean); + //FIXME +// discarded.setSetSeine(bean); } return true; } - @Override - protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<TargetCatch> oldChilds) { - - if (oldChilds != null && !oldChilds.isEmpty()) { - - // on reinjecte les discarded thon precedemment saisies dans la set - // et qui ne sont pas des rejets - - for (TargetCatch targetCatch : oldChilds) { - if (!targetCatch.isDiscarded()) { - bean.addTargetCatch(targetCatch); - } - } - } - - List<TargetLength> tailleToDelete = ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); - - if (tailleToDelete != null && !tailleToDelete.isEmpty()) { - - // on a demande la suppression de taille obsoletes - - if (log.isInfoEnabled()) { - log.info("Will remove " + tailleToDelete.size() + - " obsolete targetLength(s)."); - } - - TargetSample echantillon = bean.getTargetSample(true); - - // on supprime les echantillons obsoletes - echantillon.getTargetLength().removeAll(tailleToDelete); - } - } + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<TargetCatch> oldChilds) { +// +// if (oldChilds != null && !oldChilds.isEmpty()) { +// +// // on reinjecte les discarded thon precedemment saisies dans la set +// // et qui ne sont pas des rejets +// +// for (TargetCatch targetCatch : oldChilds) { +// if (!targetCatch.isDiscarded()) { +// bean.addTargetCatch(targetCatch); +// } +// } +// } +// +// List<TargetLength> tailleToDelete = ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); +// +// if (tailleToDelete != null && !tailleToDelete.isEmpty()) { +// +// // on a demande la suppression de taille obsoletes +// +// if (log.isInfoEnabled()) { +// log.info("Will remove " + tailleToDelete.size() + +// " obsolete targetLength(s)."); +// } +// +// TargetSample echantillon = bean.getTargetSample(true); +// +// // on supprime les echantillons obsoletes +// echantillon.getTargetLength().removeAll(tailleToDelete); +// } +// } @Override - protected void onSelectedRowChanged(int editingRow, TargetCatch bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, TargetCatchDto bean, boolean create) { TargetDiscardCatchUI ui = getUi(); - WeightCategory beanWeightCategory = bean.getWeightCategory(); - Species beanEspece = beanWeightCategory == null ? null : - beanWeightCategory.getSpecies(); - ReasonForDiscard beanReasonForDiscard = bean.getReasonForDiscard(); - if (log.isDebugEnabled()) { - log.debug("selected categoriePoid " + beanWeightCategory); - log.debug("selected species " + beanEspece); - log.debug("selected reasonForDiscard " + beanReasonForDiscard); - } + //FIXME +// WeightCategoryDto beanWeightCategory = bean.getWeightCategory(); +// SpeciesDto beanEspece = beanWeightCategory == null ? null : +// beanWeightCategory.getSpecies(); +// ReasonForDiscardDto beanReasonForDiscard = bean.getReasonForDiscard(); +// if (log.isDebugEnabled()) { +// log.debug("selected categoriePoid " + beanWeightCategory); +// log.debug("selected species " + beanEspece); +// log.debug("selected reasonForDiscard " + beanReasonForDiscard); +// } JComponent requestFocus; if (create) { - ContentTableModel<SetSeine, TargetCatch> model = getTableModel(); + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); if (model.isCreate()) { // par défaut, on considère que l'espèce a été monté sur le pont // c'est le cas le plus fréquent. @@ -441,21 +450,24 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } // on recalcule la liste des speciess disponibles - List<Species> availableEspeces = buildEspeceList( - beanEspece, beanWeightCategory); - ui.getSpecies().setData(availableEspeces); + //FIXME +// List<SpeciesDto> availableEspeces = buildEspeceList( +// beanEspece, beanWeightCategory); + //FIXME +// ui.getSpecies().setData(availableEspeces); // on reinitilise toujours l'species (pour reinitialiser la liste // des categories) ui.getSpecies().setSelectedItem(null); if (!model.isCreate()) { - // on repositionne l'species (cela reconstruira la liste - // des categories) - ui.getSpecies().setSelectedItem(beanEspece); - // on repositionne la categorie - ui.getWeightCategory().setSelectedItem(beanWeightCategory); - ui.getReasonForDiscard().setSelectedItem(beanReasonForDiscard); + //FIXME +// // on repositionne l'species (cela reconstruira la liste +// // des categories) +// ui.getSpecies().setSelectedItem(beanEspece); +// // on repositionne la categorie +// ui.getWeightCategory().setSelectedItem(beanWeightCategory); +// ui.getReasonForDiscard().setSelectedItem(beanReasonForDiscard); } requestFocus = ui.getSpecies(); @@ -464,11 +476,12 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // au singleton de sa valeur correspondante dans le bean // puisque dans ce mode, pas possibilite de modifier de cette // valeur (clef metier) - ui.getSpecies().setSelectedItem(beanEspece); - ui.getWeightCategory().setData(Arrays.asList(beanWeightCategory)); - ui.getWeightCategory().setSelectedItem(beanWeightCategory); - ui.getReasonForDiscard().setData(Arrays.asList(beanReasonForDiscard)); - ui.getReasonForDiscard().setSelectedItem(beanReasonForDiscard); + //FIXME +// ui.getSpecies().setSelectedItem(beanEspece); +// ui.getWeightCategory().setData(Arrays.asList(beanWeightCategory)); +// ui.getWeightCategory().setSelectedItem(beanWeightCategory); +// ui.getReasonForDiscard().setData(Arrays.asList(beanReasonForDiscard)); +// ui.getReasonForDiscard().setSelectedItem(beanReasonForDiscard); requestFocus = ui.getCatchWeight(); } @@ -498,19 +511,19 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, n("observe.targetDiscarded.table.comment"), n("observe.targetDiscarded.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, WeightCategory.class)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReasonForDiscard.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, WeightCategoryDto.class)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReasonForDiscardDto.class)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newStringTableCellRenderer(renderer, 20, false)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } - protected void onEspeceChanged(TargetCatch bean, Species species) { + protected void onEspeceChanged(TargetCatchDto bean, SpeciesDto species) { - WeightCategory weightCategory = null; + WeightCategoryDto weightCategory = null; - List<WeightCategory> data; + List<WeightCategoryDto> data; if (species == null) { @@ -524,12 +537,13 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // un species est selectionne, on met a jour la liste des categories // disponibles pour cet species - List<WeightCategory> availableCategories = buildWeightCategoryList( + List<WeightCategoryDto> availableCategories = buildWeightCategoryList( species); data = availableCategories; - weightCategory = bean.getWeightCategory(); + //FIXME +// weightCategory = bean.getWeightCategory(); if (weightCategory != null && !availableCategories.contains(weightCategory)) { @@ -538,18 +552,18 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } // on met a jour le model de la liste des categories - BeanComboBox<WeightCategory> combo = getUi().getWeightCategory(); + BeanComboBox<WeightCategoryDto> combo = getUi().getWeightCategory(); combo.setData(data); // on selectionne la categorie retenue combo.setSelectedItem(weightCategory); } - protected void onCategorieChanged(TargetCatch bean, WeightCategory weightCategory) { + protected void onCategorieChanged(TargetCatchDto bean, WeightCategoryDto weightCategory) { TargetDiscardCatchUI ui = getUi(); - ReasonForDiscard reasonForDiscard = null; - List<ReasonForDiscard> data; + ReasonForDiscardDto reasonForDiscard = null; + List<ReasonForDiscardDto> data; if (weightCategory == null) { // aucune categorie selectionnee, on vide simplement @@ -562,7 +576,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // un categorie est selectionne, on met a jour la liste des raisons // rejet disponible pour cette categorie - List<ReasonForDiscard> reasonForDiscardList = buildReasonFordiscardList( + List<ReasonForDiscardDto> reasonForDiscardList = buildReasonFordiscardList( weightCategory); if (log.isDebugEnabled()) { @@ -571,7 +585,8 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, data = reasonForDiscardList; - reasonForDiscard = bean.getReasonForDiscard(); + //FIXME +// reasonForDiscard = bean.getReasonForDiscard(); if (reasonForDiscard != null && !reasonForDiscardList.contains(reasonForDiscard)) { @@ -580,7 +595,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } } - BeanComboBox<ReasonForDiscard> combo = ui.getReasonForDiscard(); + BeanComboBox<ReasonForDiscardDto> combo = ui.getReasonForDiscard(); // on met a jour le model de la liste des raison rejets combo.setData(data); @@ -589,9 +604,9 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, combo.setSelectedItem(reasonForDiscard); } - protected List<Species> buildEspeceList(Species species, WeightCategory weightCategory) { + protected List<SpeciesDto> buildEspeceList(SpeciesDto species, WeightCategoryDto weightCategory) { - List<WeightCategory> weightCategoryList = getAllCategories(getUi()); + List<WeightCategoryDto> weightCategoryList = getAllCategories(getUi()); removeFullyUsedCategories(weightCategoryList); @@ -599,25 +614,26 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, weightCategoryList.add(weightCategory); } - Collection<Species> usedEspeces = new HashSet<Species>(); - for (WeightCategory cat : weightCategoryList) { - usedEspeces.add(cat.getSpecies()); + Collection<SpeciesDto> usedEspeces = new HashSet<SpeciesDto>(); + for (WeightCategoryDto cat : weightCategoryList) { + //FIXME +// usedEspeces.add(cat.getSpecies()); } - List<Species> result = new ArrayList<Species>(usedEspeces); + List<SpeciesDto> result = new ArrayList<SpeciesDto>(usedEspeces); weightCategoryList.clear(); usedEspeces.clear(); return result; } - protected List<WeightCategory> buildWeightCategoryList(Species species) { + protected List<WeightCategoryDto> buildWeightCategoryList(SpeciesDto species) { - List<WeightCategory> weightCategoryList = getAllCategories(getUi()); + List<WeightCategoryDto> weightCategoryList = getAllCategories(getUi()); // on filtre les categories sur l'espèce donnée - for (Iterator<WeightCategory> it = weightCategoryList.iterator(); + for (Iterator<WeightCategoryDto> it = weightCategoryList.iterator(); it.hasNext(); ) { - WeightCategory weighte = it.next(); + WeightCategoryDto weighte = it.next(); if (!species.equals(weighte.getSpecies())) { it.remove(); } @@ -631,15 +647,15 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } @SuppressWarnings("unchecked") - protected List<ReasonForDiscard> buildReasonFordiscardList(WeightCategory weightCategory) { + protected List<ReasonForDiscardDto> buildReasonFordiscardList(WeightCategoryDto weightCategory) { - ContentTableModel<SetSeine, TargetCatch> model = getTableModel(); - List<ReasonForDiscard> reasonForDiscardList = - new ArrayList<ReasonForDiscard>(ALL_RAISONS_REJET_ENTRY.getContextValue(getUi())); + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); + List<ReasonForDiscardDto> reasonForDiscardList = + new ArrayList<ReasonForDiscardDto>(ALL_RAISONS_REJET_ENTRY.getContextValue(getUi())); // on filtre les raison rejet sur la categorie for (int i = 0; i < model.getRowCount(); i++) { - TargetCatch c = model.getValueAt(i); + TargetCatchDto c = model.getValueAt(i); if (c != null && c.getReasonForDiscard() != null && weightCategory.equals(c.getWeightCategory())) { reasonForDiscardList.remove(c.getReasonForDiscard()); @@ -649,24 +665,24 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, return reasonForDiscardList; } - protected List<WeightCategory> getAllCategories(JAXXContext context) { - List<WeightCategory> list = new ArrayList<WeightCategory>( + protected List<WeightCategoryDto> getAllCategories(JAXXContext context) { + List<WeightCategoryDto> list = new ArrayList<WeightCategoryDto>( ALL_CATEGORIES_ENTRY.getContextValue(context)); return list; } protected void removeFullyUsedCategories( - List<WeightCategory> weightCategoryAvaillable) { + List<WeightCategoryDto> weightCategoryAvaillable) { - ContentTableModel<SetSeine, TargetCatch> model = getTableModel(); + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); int nbReasonForDiscard = ALL_RAISONS_REJET_ENTRY.getContextValue(getUi()).size(); // on filtre toutes les weightCategory qui ont deja references toutes // les raisons rejets - for (WeightCategory c : getWeightCategoryUsed(model)) { - Collection<ReasonForDiscard> raisonUsed = getReasonForDiscardUsed(model, c); + for (WeightCategoryDto c : getWeightCategoryUsed(model)) { + Collection<ReasonForDiscardDto> raisonUsed = getReasonForDiscardUsed(model, c); if (raisonUsed.size() == nbReasonForDiscard) { // toutes les raison de rejet epuisé pour cette categorie weightCategoryAvaillable.remove(c); 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 d5fb818..065199b 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 @@ -122,7 +122,7 @@ public String getLengthDataTip(boolean computed) { <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='Species' constructorParams='this'/> + <BeanComboBox id='species' genericType='SpeciesDto' constructorParams='this'/> </cell> </row> 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 7da40e9..8baac80 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 @@ -21,21 +21,21 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; -import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +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; -import fr.ird.observe.ui.content.table.ContentTableUI; import fr.ird.observe.ui.content.table.ContentTableUIHandler; +import fr.ird.observe.ui.content.table.ContentTableUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -53,7 +53,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, TargetLength> { +public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto, TargetLengthDto> { /** Logger */ static private Log log = LogFactory.getLog(TargetSampleUIHandler.class); @@ -76,7 +76,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T protected final PropertyChangeListener weightChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - TargetLength source = (TargetLength) evt.getSource(); + TargetLengthDto source = (TargetLengthDto) evt.getSource(); source.setWeightSource(false); } }; @@ -91,12 +91,12 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T protected final PropertyChangeListener lengthChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - TargetLength source = (TargetLength) evt.getSource(); + TargetLengthDto source = (TargetLengthDto) evt.getSource(); source.setLengthSource(false); } }; - public TargetSampleUIHandler(ContentTableUI<TargetSample, TargetLength> ui, + public TargetSampleUIHandler(ContentTableUI<TargetSampleDto, TargetLengthDto> ui, boolean discarded) { super(ui, DataContextType.SetSeine); this.discarded = discarded; @@ -117,72 +117,73 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T getUi().getLength().grabFocus(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - String setId = dataContext.getSelectedSetId(); - // on doit récupérer l'unique échantillonThon de la calée - String id = dataService.getTargetSampleId(dataSource, setId, discarded); - return id; - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// String setId = dataContext.getSelectedSetId(); +// // on doit récupérer l'unique échantillonThon de la calée +// String id = dataService.getTargetSampleId(dataSource, setId, discarded); +// return id; +// } + +// @Override +// protected TargetSample loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// String setId = dataContext.getSelectedSetId(); +// +// if (mode == ContentMode.UPDATE) { +// +// // on ne charge les speciess uniquement si on est en mode édition +// List<Species> speciess = +// dataService.getAvailableEspeceForTargetSample(dataSource, setId, discarded); +// +// getUi().getSpecies().setData(speciess); +// } +// +// // on doit récupérer l'unique échantillonThon de la calée +// String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); +// +// TargetSample editBean = getBean(); +// +// if (log.isInfoEnabled()) { +// log.info(prefix + " - set id : " + setId); +// log.info(prefix + " - echantillon thon id : " + id); +// log.info(prefix + " - edit bean id : " + editBean.getTopiaId()); +// } +// +// if (id == null) { +// +// // l'échantillon n'existe pas encore, donc rien a faire +// getLoadBinder().load(null, editBean, true); +// +// getModel().getChildsUpdator().setChilds(editBean, new ArrayList<TargetLength>()); +// } else { +// +// // preparation du bean d'édition +// dataService.loadEditEntity(dataSource, id, getLoadExecutor()); +// } +// +// getModel().setMode(mode); +// +// // initialisation du modèle du tableau +// getUi().getTableModel().attachModel(); +// +// return editBean; +// } @Override - protected TargetSample loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - String setId = dataContext.getSelectedSetId(); - - if (mode == ContentMode.UPDATE) { - - // on ne charge les speciess uniquement si on est en mode édition - List<Species> speciess = - dataService.getAvailableEspeceForTargetSample(dataSource, setId, discarded); - - getUi().getSpecies().setData(speciess); - } - - // on doit récupérer l'unique échantillonThon de la calée - String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); - - TargetSample editBean = getBean(); - - if (log.isInfoEnabled()) { - log.info(prefix + " - set id : " + setId); - log.info(prefix + " - echantillon thon id : " + id); - log.info(prefix + " - edit bean id : " + editBean.getTopiaId()); - } - - if (id == null) { - - // l'échantillon n'existe pas encore, donc rien a faire - getLoadBinder().load(null, editBean, true); - - getModel().getChildsUpdator().setChilds(editBean, new ArrayList<TargetLength>()); - } else { - - // preparation du bean d'édition - dataService.loadEditEntity(dataSource, id, getLoadExecutor()); - } - - getModel().setMode(mode); - - // initialisation du modèle du tableau - getUi().getTableModel().attachModel(); - - return editBean; - } - - @Override - protected boolean prepareSave(TargetSample bean, List<TargetLength> objets) throws DataSourceException { + protected boolean prepareSave(TargetSampleDto bean, List<TargetLengthDto> objets) throws DataSourceException { boolean withLengths = !objets.isEmpty(); if (withLengths) { - if (bean.getTopiaId() == null) { + if (bean.getId() == null) { String setId = getDataContext().getSelectedSetId(); @@ -192,14 +193,16 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T log.debug("Will create targetSample " + bean + " for " + setId); } - getDataService().create(getDataSource(), setId, bean, null, getCreateExecutor()); + //FIXME +// getDataService().create(getDataSource(), setId, bean, null, getCreateExecutor()); } - for (TargetLength targetLength : objets) { + for (TargetLengthDto targetLength : objets) { // on attache a l'echantillon - targetLength.setTargetSample(bean); + //FIXME +// targetLength.setTargetSample(bean); } } @@ -208,59 +211,62 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T } + //FIXME +// @Override +// protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// if (bean.getTopiaId() != null && bean.isTargetLengthEmpty()) { +// +// // remove orphan target sample +// +// String setId = getDataContext().getSelectedSetId(); +// if (log.isInfoEnabled()) { +// log.info("Remove obsolete targetSample " + bean.getTopiaId() + " from Set: " + setId); +// } +// getDataService().delete(getDataSource(), setId, bean, getDeleteExecutor()); +// +// } else { +// +// // normal persist +// super.doPersist(bean, dataService, dataSource); +// +// } +// +// } + + //FIXME +// @Override +// protected TargetSample onCreate(TopiaContext tx, +// Object parent, +// TargetSample editBean) throws TopiaException { +// SetSeine parentBean = (SetSeine) parent; +// TargetSample beanToSave = +// ObserveDAOHelper.getTargetSampleDAO(tx).create(); +// beanToSave.setDiscarded(discarded); +// editBean.setTopiaId(beanToSave.getTopiaId()); +// editBean.setTopiaCreateDate(beanToSave.getTopiaCreateDate()); +// editBean.setTopiaVersion(beanToSave.getTopiaVersion()); +// parentBean.addTargetSample(beanToSave); +// return beanToSave; +// } + + //FIXME @Override - protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { - - if (bean.getTopiaId() != null && bean.isTargetLengthEmpty()) { - - // remove orphan target sample - - String setId = getDataContext().getSelectedSetId(); - if (log.isInfoEnabled()) { - log.info("Remove obsolete targetSample " + bean.getTopiaId() + " from Set: " + setId); - } - getDataService().delete(getDataSource(), setId, bean, getDeleteExecutor()); - - } else { - - // normal persist - super.doPersist(bean, dataService, dataSource); - - } +// protected void onDelete(TopiaContext tx, Object parent, TargetSample beanToDelete) throws TopiaException { +// SetSeine parentBean = (SetSeine) parent; +// parentBean.removeTargetSample(beanToDelete); +// } - } + protected void onSelectedRowChanged(int editingRow, TargetLengthDto bean, boolean create) { - @Override - protected TargetSample onCreate(TopiaContext tx, - Object parent, - TargetSample editBean) throws TopiaException { - SetSeine parentBean = (SetSeine) parent; - TargetSample beanToSave = - ObserveDAOHelper.getTargetSampleDAO(tx).create(); - beanToSave.setDiscarded(discarded); - editBean.setTopiaId(beanToSave.getTopiaId()); - editBean.setTopiaCreateDate(beanToSave.getTopiaCreateDate()); - editBean.setTopiaVersion(beanToSave.getTopiaVersion()); - parentBean.addTargetSample(beanToSave); - return beanToSave; - } - - @Override - protected void onDelete(TopiaContext tx, Object parent, TargetSample beanToDelete) throws TopiaException { - SetSeine parentBean = (SetSeine) parent; - parentBean.removeTargetSample(beanToDelete); - } - - @Override - protected void onSelectedRowChanged(int editingRow, TargetLength bean, boolean create) { - - ContentTableModel<TargetSample, TargetLength> model = getTableModel(); + ContentTableModel<TargetSampleDto, TargetLengthDto> model = getTableModel(); TargetSampleUI ui = getUi(); if (!model.isEditable()) { return; } - Species species = bean.getSpecies(); + //FIXME +// SpeciesDto species = bean.getSpecies(); JComponent requestFocus; @@ -271,8 +277,9 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T if (editingRow > 0) { // on recupere l'species de la ligne precedente - TargetLength editBean = model.getValueAt(editingRow - 1); - species = editBean.getSpecies(); + TargetLengthDto editBean = model.getValueAt(editingRow - 1); + //FIXME +// species = editBean.getSpecies(); } // on passe le mode de saisie en count @@ -301,20 +308,21 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T // on met a jour l'espce ui.getSpecies().setSelectedItem(null); - if (species != null) { - if (log.isDebugEnabled()) { - log.debug("species to use " + species); - } - ui.getSpecies().setSelectedItem(species); - } + //FIXME +// if (species != null) { +// if (log.isDebugEnabled()) { +// log.debug("species to use " + species); +// } +// ui.getSpecies().setSelectedItem(species); +// } requestFocus.requestFocus(); - TargetLength tableEditBean = getTableEditBean(); - tableEditBean.removePropertyChangeListener(TargetLength.PROPERTY_WEIGHT, weightChanged); - tableEditBean.addPropertyChangeListener(TargetLength.PROPERTY_WEIGHT, weightChanged); + TargetLengthDto tableEditBean = getTableEditBean(); + tableEditBean.removePropertyChangeListener(TargetLengthDto.PROPERTY_WEIGHT, weightChanged); + tableEditBean.addPropertyChangeListener(TargetLengthDto.PROPERTY_WEIGHT, weightChanged); - tableEditBean.removePropertyChangeListener(TargetLength.PROPERTY_LENGTH, lengthChanged); - tableEditBean.addPropertyChangeListener(TargetLength.PROPERTY_LENGTH, lengthChanged); + tableEditBean.removePropertyChangeListener(TargetLengthDto.PROPERTY_LENGTH, lengthChanged); + tableEditBean.addPropertyChangeListener(TargetLengthDto.PROPERTY_LENGTH, lengthChanged); } @Override @@ -337,7 +345,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T n("observe.targetSample.table.totalWeight"), n("observe.targetSample.table.totalWeight.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEnumTableCellRenderer(renderer, CodeMesureEnum.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -351,14 +359,15 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T boolean showData = false; - try { - String setId = getDataContext().getSelectedSetId(); - showData = getDataService().canUseTargetSample(getDataSource(), setId, discarded); - } catch (DataSourceException e) { - if (log.isErrorEnabled()) { - log.error(e); - } - } + //FIXME +// try { +// String setId = getDataContext().getSelectedSetId(); +// showData = getDataService().canUseTargetSample(getDataSource(), setId, discarded); +// } catch (DataSourceException e) { +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// } getModel().setShowData(showData); @@ -368,7 +377,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T addMessage(getUi(), NuitonValidatorScope.INFO, - getEntityLabel(SetSeine.class), + getEntityLabel(SetSeineDto.class), discarded ? t("observe.setSeine.message.no.targetCatch") : t("observe.setSeine.message.no.targetDiscarded") @@ -398,7 +407,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T boolean createMode = ui.getTableModel().isCreate(); - TargetLength editBean = ui.getTableEditBean(); + TargetLengthDto editBean = ui.getTableEditBean(); switch (newMode) { case byEffectif: diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java index 639f893..5950b3f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.storage; import fr.ird.observe.ObserveContext; -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DbMode; -import fr.ird.observe.business.db.impl.H2DataSource; -import fr.ird.observe.business.db.model.DataSelectionModel; import jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,13 +60,14 @@ public class StorageBackupUILauncher extends StorageUILauncher { StorageUIModel model = ui.getModel(); model.setCanCreateLocalService(false); - if (source instanceof H2DataSource) { - model.setCanUseLocalService(true); - model.setDbMode(DbMode.USE_LOCAL); - } else { + //FIXME +// if (source instanceof H2DataSource) { +// model.setCanUseLocalService(true); +// model.setDbMode(DbMode.USE_LOCAL); +// } else { model.setCanUseRemoteService(true); model.setDbMode(DbMode.USE_REMOTE); - } +// } model.setSteps(StorageStep.BACKUP, StorageStep.SELECT_DATA, 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 ad035dd..d90ca8e 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 @@ -27,21 +27,12 @@ import fr.ird.observe.ObserveActionExecutor; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveContext; import fr.ird.observe.ObserveRunner; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceConfig; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.DataSourceFactory; -import fr.ird.observe.business.db.ReplicationService; import fr.ird.observe.business.db.constants.CreationMode; import fr.ird.observe.business.db.constants.DbMode; -import fr.ird.observe.business.db.event.DataSourceEvent; -import fr.ird.observe.business.db.event.DataSourceListenerAdapter; -import fr.ird.observe.business.db.impl.H2DataSource; -import fr.ird.observe.business.db.impl.H2DataSourceConfig; -import fr.ird.observe.business.db.impl.PGDataSource; -import fr.ird.observe.business.db.impl.PGDataSourceConfig; -import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.business.util.SecurityModel; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; @@ -287,8 +278,9 @@ public class StorageUIHandler { if (StorageStep.SELECT_DATA == newStep && mustRecompute) { - if (ObstunaAdminAction.CREATE == ui.getModel().getAdminAction() && - model.getSelectDataModel() == null) { + if (ObstunaAdminAction.CREATE == ui.getModel().getAdminAction() ) { + //FIXME +// && model.getSelectDataModel() == null) { // récupération des données possibles à importer initSelectData(ui); @@ -876,7 +868,7 @@ public class StorageUIHandler { //FIXME // addTag("li", sb, // model.getH2Config().getDataDirectory().getAbsolutePath() - ); +// ); addCloseTag("ul", sb); computeCanMigrateAction(model, sb); @@ -990,7 +982,7 @@ public class StorageUIHandler { addTag("li", sb, model.getBackupFile().getAbsolutePath()); addCloseTag("ul", sb); - if (!model.isUseSelectData() || model.getSelectDataModel() == null) { + if (!model.isUseSelectData()) { //FIXME || model.getSelectDataModel() == null) { return; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx index 3c9492c..9dbfa89 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx @@ -29,8 +29,8 @@ fr.ird.observe.ObserveConfig fr.ird.observe.ui.UIHelper fr.ird.observe.ui.storage.StorageStep - fr.ird.observe.db.constants.DbMode - fr.ird.observe.db.constants.CreationMode + fr.ird.observe.business.db.constants.DbMode + fr.ird.observe.business.db.constants.CreationMode </import> <StorageStep id='step' initializer='StorageStep.CHOOSE_DB_MODE'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx index c10cfae..80748d1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx @@ -26,7 +26,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.constants.CreationMode + fr.ird.observe.business.db.constants.CreationMode fr.ird.observe.ui.storage.StorageStep javax.swing.Icon diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx index 15025e4..0d95cb0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx @@ -26,7 +26,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.constants.CreationMode + fr.ird.observe.business.db.constants.CreationMode fr.ird.observe.ui.storage.StorageStep javax.swing.Icon diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx index db98abc..db7d07e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx @@ -28,7 +28,7 @@ <import> fr.ird.observe.ui.storage.StorageStep - fr.ird.observe.db.constants.ConnexionStatus + fr.ird.observe.business.db.constants.ConnexionStatus java.awt.Color java.awt.Dimension diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx index c4db2af..50c1ee3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx @@ -27,7 +27,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.util.SecurityModel + fr.ird.observe.business.util.SecurityModel fr.ird.observe.ui.storage.StorageStep fr.ird.observe.ui.storage.StorageUIModel </import> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx index 43e3b4c..4d88ef5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx @@ -27,7 +27,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.DataSource + fr.ird.observe.business.db.DataSource fr.ird.observe.ui.storage.StorageStep fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.ui.tree.DataSelectionTreeCellRenderer diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java index 5cc617a..fbe5620 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java @@ -343,22 +343,24 @@ public class StorageTabUIHandler { text = t(text); break; case SUCCESS: - text = t(text, ui.model.getPgConfig().toString()); + //FIXME +// text = t(text, ui.model.getPgConfig().toString()); break; case FAILED: - if (ui.model.getPgConfig().getConnexionError() != null) { - // real connexion error - text = t(text, ui.model.getPgConfig().getConnexionError().getMessage()); - } else { - - // remote version mismatch - Preconditions.checkState(!ui.model.isPgConfigVersionMatch()); - - String error = t("observe.storage.error.dbVersionMismatch", ui.model.getPgConfig().getVersion(), ui.model.getDbVersion()); - - text = t(text, error); - } + //FIXME +// if (ui.model.getPgConfig().getConnexionError() != null) { +// // real connexion error +// text = t(text, ui.model.getPgConfig().getConnexionError().getMessage()); +// } else { +// +// // remote version mismatch +// Preconditions.checkState(!ui.model.isPgConfigVersionMatch()); +// +// String error = t("observe.storage.error.dbVersionMismatch", ui.model.getPgConfig().getVersion(), ui.model.getDbVersion()); +// +// text = t(text, error); +// } break; } 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 28c638f..852ce65 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 @@ -45,7 +45,6 @@ import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; 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.*; import javax.swing.tree.DefaultTreeModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index cc65020..2a47d48 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -128,14 +128,15 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { protected void loadEntity(ObserveDataProvider oProvider) { - if (oProvider.getSelectionModel() != null) { + //FIXME +// if (oProvider.getSelectionModel() != null) { if (log.isDebugEnabled()) { log.debug("try to get entity from selectionModel " + internalClass + " : " + id); } //FIXME // entity = (E) oProvider.getSelectionModel().getEntityCache(id); - } +// } if (entity == null) { 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 1d46107..cb0a1f4 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 @@ -36,6 +36,7 @@ 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; import fr.ird.observe.ui.tree.loadors.ActivityLonglinesNodeChildLoador; 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 f5995f6..9acb6a8 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 @@ -25,7 +25,6 @@ import fr.ird.observe.business.db.DataSource; 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; import fr.ird.observe.ui.tree.RouteSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -59,7 +58,8 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { DataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); //FIXME // List<RouteDto> data = getDataService().getRouteStubByTrip(dataSource, parentId); - return data; +// return data; + return null; } 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 fff52c1..b64d064 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 @@ -43,7 +43,7 @@ private UsagesUIHandler handler = new UsagesUIHandler(); public void init(String message, String message2, String message3, - Map<Class<? extends TopiaEntity>, List<? extends AbstractObserveDto>> usages) { + Map<Class<? extends AbstractObserveDto>, 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 2ea7dd8..c68c0c8 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,11 +23,11 @@ package fr.ird.observe.ui.usage; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveContext; +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; 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.JLabel; import javax.swing.JList; @@ -61,8 +61,8 @@ public class UsagesUIHandler { public void initUI(UsagesUI ui, String message, String message2, String message3, - Map<Class<? extends TopiaEntity>, - List<? extends TopiaEntity>> usages) { + Map<Class<? extends AbstractObserveDto>, + List<? extends AbstractObserveDto>> usages) { // toujours nettoyer l'ui avant tout cleanUI(ui); @@ -80,10 +80,10 @@ public class UsagesUIHandler { t("observe.message.no.usage.for.entity"))); } else { - for (Map.Entry<Class<? extends TopiaEntity>, - List<? extends TopiaEntity>> entry : usages.entrySet()) { - Class<? extends TopiaEntity> type = entry.getKey(); - List<? extends TopiaEntity> entitites = entry.getValue(); + for (Map.Entry<Class<? extends AbstractObserveDto>, + List<? extends AbstractObserveDto>> entry : usages.entrySet()) { + Class<? extends AbstractObserveDto> type = entry.getKey(); + List<? extends AbstractObserveDto> entitites = entry.getValue(); String typeTitle = DecoratorService.getEntityLabel(type); typeTitle = t(typeTitle); addUsages(ui, type, entitites, typeTitle); @@ -101,8 +101,8 @@ public class UsagesUIHandler { } protected void addUsages(UsagesUI ui, - Class<? extends TopiaEntity> type, - List<? extends TopiaEntity> entitites, + Class<? extends AbstractObserveDto> type, + List<? extends AbstractObserveDto> entitites, String typeTitle) { JScrollPane pane = new JScrollPane(); @@ -127,7 +127,7 @@ public class UsagesUIHandler { throw new NullPointerException( "could not find decorator for type " + type); } - for (TopiaEntity entitite : entitites) { + for (AbstractObserveDto entitite : entitites) { try { String s = decorator.toString(entitite); data.add(s); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java index 54f2cc1..9f7b0dd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java @@ -24,8 +24,7 @@ package fr.ird.observe.ui.util.table; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; +import fr.ird.observe.services.dto.AbstractObserveDto; import java.util.ArrayList; import java.util.Collections; @@ -40,7 +39,7 @@ import java.util.TreeMap; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public abstract class EditableTableWithCacheTableModelSupport<E extends TopiaEntity> extends EditableTableModelSupport<E> { +public abstract class EditableTableWithCacheTableModelSupport<E extends AbstractObserveDto> extends EditableTableModelSupport<E> { private static final long serialVersionUID = 1L; @@ -54,17 +53,18 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends TopiaEnt /** * Pour pouvoir faire des copies de chaque object. */ - protected final TopiaEntityBinder<E> loader; + //FIXME +// protected final TopiaEntityBinder<E> loader; - protected EditableTableWithCacheTableModelSupport(TopiaEntityBinder<E> loader) { + protected EditableTableWithCacheTableModelSupport() { super(true); - this.loader = loader; this.cacheByRow = new TreeMap<Integer, EditableList<E>>(); } - public TopiaEntityBinder<E> getLoader() { - return loader; - } + //FIXME +// public TopiaEntityBinder<E> getLoader() { +// return loader; +// } public List<E> getCacheForRow(int rowIndex) { EditableList<E> measures = cacheByRow.get(rowIndex); @@ -148,7 +148,8 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends TopiaEnt List<E> copy = new ArrayList<E>(data.size()); for (E measure : data) { E originalMeasure = createNewRow(); - loader.load(measure, originalMeasure, true); + //FIXME +// loader.load(measure, originalMeasure, true); copy.add(originalMeasure); } return copy; diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 437f02e..eeccb53 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1,6 +1,19 @@ +nuitonutil.error.convertor.noValue= +nuitonutil.error.float.convertor= +nuitonutil.error.no.convertor= observe.about.message= observe.about.translate.content= observe.about.translate.title= +observe.action.HookSize.create.tip= +observe.action.HookSize.delete.tip= +observe.action.HookSize.detail.tip= +observe.action.HookSize.modify.tip= +observe.action.HookSize.save.tip= +observe.action.HookType.create.tip= +observe.action.HookType.delete.tip= +observe.action.HookType.detail.tip= +observe.action.HookType.modify.tip= +observe.action.HookType.save.tip= observe.action.about= observe.action.about.tip= observe.action.add.floatingObject= @@ -715,11 +728,21 @@ observe.common.acquisitionMode.individu= observe.common.activities= observe.common.activities.list= observe.common.activity= +observe.common.activityLongline= +observe.common.activitySeine= +observe.common.baitHaulingStatus= observe.common.baitObservation= +observe.common.baitSettingStatus= +observe.common.baitType= +observe.common.baitsComposition= +observe.common.basket= observe.common.birdsObservation= observe.common.boolean.false= observe.common.boolean.null= observe.common.boolean.true= +observe.common.branchline= +observe.common.branchlineLength= +observe.common.branchlinesComposition= observe.common.brand= observe.common.brandName= observe.common.broughtOnDeck= @@ -727,6 +750,8 @@ observe.common.capacity= observe.common.capacityLabel= observe.common.captain= observe.common.caracteristics= +observe.common.catchFateLongline= +observe.common.catchLongline= observe.common.catchWeight= observe.common.catchWeightComputed.computed.tip= observe.common.catchWeightComputed.observed.tip= @@ -754,22 +779,53 @@ observe.common.description= observe.common.detailledActivitiesObservation= observe.common.detectionMode= observe.common.directory= +observe.common.encounter= +observe.common.encounterType= observe.common.endDate= observe.common.endLogValue= observe.common.equation= observe.common.ersId= +observe.common.faoCode= observe.common.file= observe.common.firstName= observe.common.flagCountry= +observe.common.floatingObject= +observe.common.floatline1Length= +observe.common.floatline2Length= +observe.common.floatlineLengths= +observe.common.floatlinesComposition= observe.common.formsUrl= +observe.common.fpaZone= observe.common.gaugeLabel= +observe.common.gear= +observe.common.gearCaracteristic= +observe.common.gearCaracteristicType= observe.common.gearType= +observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesSeine= +observe.common.gender= observe.common.generateReport= observe.common.global.progression.description= +observe.common.gps.activity= +observe.common.gps.gpsPoint= +observe.common.gps.gpsPointInterval= +observe.common.gpsPointInterval= +observe.common.harbour= +observe.common.haulingIdentifier= +observe.common.healthness= observe.common.heureobservation= +observe.common.homeId= observe.common.homeIdFAOWormsId= +observe.common.hookPosition= +observe.common.hookSize= +observe.common.hookType= +observe.common.hooksComposition= +observe.common.id= +observe.common.inconnu= observe.common.iso2Code= observe.common.iso3Code= +observe.common.itemHorizontalPosition= +observe.common.itemVerticalPosition= observe.common.keelCodeFlotte= observe.common.label1= observe.common.label2= @@ -788,10 +844,16 @@ observe.common.length.inf= observe.common.length.observed.tip= observe.common.lengthMeasureType= observe.common.lengthWeightFormula= +observe.common.lengthWeightParameter= observe.common.libelles= +observe.common.lightsticksColor= +observe.common.lightsticksType= +observe.common.lineType= +observe.common.locode= observe.common.longitude= observe.common.lowerValueUpperValue= observe.common.mammalsObservation= +observe.common.maturityStatus= observe.common.meanLength= observe.common.meanLengthComputed.computed.tip= observe.common.meanLengthComputed.observed.tip= @@ -805,30 +867,48 @@ observe.common.measureType.lf= observe.common.measureType.unknown= observe.common.minLengthMax= observe.common.minWeightMax= +observe.common.mitigationType= +observe.common.name= observe.common.needComment= observe.common.nextFpaZone= observe.common.no.balise= +observe.common.nocode= observe.common.nonCoupSenne= observe.common.nonTargetCatch= +observe.common.nonTargetLength= observe.common.nonTargetObservation= observe.common.nonTargetSample= +observe.common.none= observe.common.objectFate= observe.common.objectObservedSpecies= observe.common.objectOperation= +observe.common.objectSchoolEstimate= observe.common.objectType= observe.common.objectsObservation= observe.common.observedSystem= observe.common.observedSystemDistance= observe.common.observer= +observe.common.observerLabel= observe.common.obsolete.entity= observe.common.ocean= +observe.common.ocean/label1= +observe.common.ocean/label2= +observe.common.ocean/label3= +observe.common.ocean/label4= +observe.common.ocean/label5= +observe.common.ocean/label6= +observe.common.ocean/label7= +observe.common.ocean/label8= observe.common.oceanForSpecies= +observe.common.oldCode3L= observe.common.operation.resume= observe.common.organism= observe.common.ownership= +observe.common.person= observe.common.picturesReferences= observe.common.power= observe.common.previousFpaZone= +observe.common.program= observe.common.program.observation.value.0= observe.common.program.observation.value.1= observe.common.program.observation.value.2= @@ -840,8 +920,11 @@ observe.common.program.observation.value.7= observe.common.program.observation.value.8= observe.common.program.observation.value.9= observe.common.reasonForDiscard= +observe.common.reasonForNoFishing= +observe.common.reasonForNullSet= observe.common.reportsUrl= observe.common.resume= +observe.common.route= observe.common.routes.list= observe.common.samplesObservation= observe.common.schoolEstimate= @@ -849,6 +932,7 @@ observe.common.schoolType= observe.common.scientificLabel= observe.common.seaSurfaceTemperature= observe.common.searchMaximum= +observe.common.section= observe.common.select.gps.import.file= observe.common.select.gps.import.file.tip= observe.common.select.gps.maxDelay= @@ -864,11 +948,24 @@ observe.common.select.validate.mode.tip= observe.common.select.validate.scope= observe.common.select.validate.scope.tip= observe.common.selected.validators= +observe.common.sensorBrand= +observe.common.sensorDataFormat= +observe.common.sensorPosition= +observe.common.sensorType= +observe.common.sensorUsed= +observe.common.setLongline= +observe.common.setSeine= +observe.common.settingIdentifier= +observe.common.settingShape= observe.common.sex= +observe.common.sizeMeasure= +observe.common.sizeMeasureType= observe.common.species= +observe.common.species/scientificLabel= observe.common.speciesFate= observe.common.speciesFaune= observe.common.speciesGroup= +observe.common.speciesList= observe.common.speciesStatus= observe.common.speciesThon= observe.common.speedRange= @@ -878,6 +975,7 @@ observe.common.startDateFinValidite= observe.common.startLogValue= observe.common.status= observe.common.step.description= +observe.common.stomacFullness= observe.common.storage.not.valid= observe.common.supportVesselName= observe.common.surroundingActivity= @@ -886,8 +984,12 @@ observe.common.taillePoids.caracteristics= observe.common.targetCatch= observe.common.targetDiscarded= observe.common.targetDiscardsObservation= +observe.common.targetLength= observe.common.targetSample= observe.common.targetSampleCapture= +observe.common.tdr= +observe.common.tdrRecord= +observe.common.time= observe.common.topiaCreateDate= observe.common.topiaId= observe.common.topiaVersion= @@ -895,16 +997,38 @@ observe.common.totalCount= observe.common.totalCountComputed.computed.tip= observe.common.totalCountComputed.observed.tip= observe.common.totalWeight= +observe.common.tracelineLength= +observe.common.transmittingBuoy= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= +observe.common.tripLongline= +observe.common.tripSeine= +observe.common.tripType= observe.common.trips.list= observe.common.typeTransmittingBuoyOperation= observe.common.undefined= observe.common.undefined.tip= observe.common.uri= observe.common.vessel= +observe.common.vessel/label1= +observe.common.vessel/label2= +observe.common.vessel/label3= +observe.common.vessel/label4= +observe.common.vessel/label5= +observe.common.vessel/label6= +observe.common.vessel/label7= +observe.common.vessel/label8= +observe.common.vesselActivityLongline= observe.common.vesselActivitySeine= observe.common.vesselActivitySeine.comment= +observe.common.vesselActivitySeine/label1= +observe.common.vesselActivitySeine/label2= +observe.common.vesselActivitySeine/label3= +observe.common.vesselActivitySeine/label4= +observe.common.vesselActivitySeine/label5= +observe.common.vesselActivitySeine/label6= +observe.common.vesselActivitySeine/label7= +observe.common.vesselActivitySeine/label8= observe.common.vesselSizeCategory= observe.common.vesselSpeed= observe.common.vesselType= @@ -915,6 +1039,8 @@ observe.common.weight.ind= observe.common.weight.observed.tip= observe.common.weightCategory= observe.common.weightLengthFormula= +observe.common.weightMeasure= +observe.common.weightMeasureType= observe.common.well= observe.common.wind= observe.common.yearService= @@ -1134,6 +1260,8 @@ observe.label.usage.referentiel.title= observe.label.weightLengthFormula.info= observe.lengthWeightParameter.tab.general= observe.lengthWeightParameter.tab.other= +observe.list.HookSize= +observe.list.HookType= observe.list.baitHaulingStatus= observe.list.baitSettingStatus= observe.list.baitType= @@ -1281,8 +1409,22 @@ observe.map.legend.hauling= observe.map.legend.setting= observe.map.legend.tripBetweenTwoDays= observe.map.legend.tripDay= +observe.map.longLine.activity= +observe.map.longLine.activity.hauling.end= +observe.map.longLine.activity.hauling.start= +observe.map.longLine.activity.interaction= +observe.map.longLine.activity.setting.end= +observe.map.longLine.activity.setting.start= +observe.map.longLine.activity.station= +observe.map.longLine.seine.harbour= observe.map.miles= observe.map.north= +observe.map.seine.activity= +observe.map.seine.activity.inHarbour= +observe.map.seine.activity.schollType.free= +observe.map.seine.activity.schollType.object= +observe.map.seine.harbour.departure= +observe.map.seine.harbour.landing= observe.map.south= observe.map.waitLoading= observe.map.west= @@ -1598,6 +1740,36 @@ observe.speciesList.selectedSpecies= observe.speciesList.tab.general= observe.speciesList.tab.species= observe.storage.action.canMigrate= +observe.storage.connexionStatut.failed= +observe.storage.connexionStatut.failed.description= +observe.storage.connexionStatut.success= +observe.storage.connexionStatut.success.description= +observe.storage.connexionStatut.untested= +observe.storage.connexionStatut.untested.description= +observe.storage.creationMode.empty= +observe.storage.creationMode.empty.description= +observe.storage.creationMode.externalDump= +observe.storage.creationMode.externalDump.description= +observe.storage.creationMode.importLocalStorage= +observe.storage.creationMode.importLocalStorage.description= +observe.storage.creationMode.importRemoteStorage= +observe.storage.creationMode.importRemoteStorage.description= +observe.storage.creationMode.internalDump= +observe.storage.creationMode.internalDump.description= +observe.storage.dataPolicy.readData= +observe.storage.dataPolicy.readData.description= +observe.storage.dataPolicy.readReferentiel= +observe.storage.dataPolicy.readReferentiel.description= +observe.storage.dataPolicy.writeData= +observe.storage.dataPolicy.writeData.description= +observe.storage.dataPolicy.writeReferentiel= +observe.storage.dataPolicy.writeReferentiel.description= +observe.storage.dbMode.createLocal= +observe.storage.dbMode.createLocal.description= +observe.storage.dbMode.useLocal= +observe.storage.dbMode.useLocal.description= +observe.storage.dbMode.useRemote= +observe.storage.dbMode.useRemote.description= observe.storage.error.dbVersionMismatch= observe.storage.importExternalDump.config= observe.storage.importExternalDump.description= @@ -1626,6 +1798,7 @@ observe.storage.label.synchro= observe.storage.label.synchro.incoming= observe.storage.label.synchro.referentiel= observe.storage.locale.db= +observe.storage.message.provider.detected= observe.storage.no.creationMode= observe.storage.no.creationMode.required= observe.storage.no.dbMode= @@ -1933,6 +2106,8 @@ observe.title.connect.localDB= observe.title.connect.remoteDB= observe.title.consolidate= observe.title.consolidate.tip= +observe.title.content.HookSizes= +observe.title.content.HookTypes= observe.title.content.baitHaulingStatuss= observe.title.content.baitSettingStatuss= observe.title.content.baitTypes= @@ -2139,6 +2314,12 @@ observe.tripSeine.message.updating= observe.tripSeine.tab.general= observe.tripSeine.tab.map= observe.tripSeine.title= +observe.validation.model.type.all= +observe.validation.model.type.all.description= +observe.validation.model.type.data= +observe.validation.model.type.data.description= +observe.validation.model.type.referentiel= +observe.validation.model.type.referentiel.description= observe.validation.report.contextName= observe.validation.report.entities.with.messages= observe.validation.report.entity= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 437f02e..eeccb53 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1,6 +1,19 @@ +nuitonutil.error.convertor.noValue= +nuitonutil.error.float.convertor= +nuitonutil.error.no.convertor= observe.about.message= observe.about.translate.content= observe.about.translate.title= +observe.action.HookSize.create.tip= +observe.action.HookSize.delete.tip= +observe.action.HookSize.detail.tip= +observe.action.HookSize.modify.tip= +observe.action.HookSize.save.tip= +observe.action.HookType.create.tip= +observe.action.HookType.delete.tip= +observe.action.HookType.detail.tip= +observe.action.HookType.modify.tip= +observe.action.HookType.save.tip= observe.action.about= observe.action.about.tip= observe.action.add.floatingObject= @@ -715,11 +728,21 @@ observe.common.acquisitionMode.individu= observe.common.activities= observe.common.activities.list= observe.common.activity= +observe.common.activityLongline= +observe.common.activitySeine= +observe.common.baitHaulingStatus= observe.common.baitObservation= +observe.common.baitSettingStatus= +observe.common.baitType= +observe.common.baitsComposition= +observe.common.basket= observe.common.birdsObservation= observe.common.boolean.false= observe.common.boolean.null= observe.common.boolean.true= +observe.common.branchline= +observe.common.branchlineLength= +observe.common.branchlinesComposition= observe.common.brand= observe.common.brandName= observe.common.broughtOnDeck= @@ -727,6 +750,8 @@ observe.common.capacity= observe.common.capacityLabel= observe.common.captain= observe.common.caracteristics= +observe.common.catchFateLongline= +observe.common.catchLongline= observe.common.catchWeight= observe.common.catchWeightComputed.computed.tip= observe.common.catchWeightComputed.observed.tip= @@ -754,22 +779,53 @@ observe.common.description= observe.common.detailledActivitiesObservation= observe.common.detectionMode= observe.common.directory= +observe.common.encounter= +observe.common.encounterType= observe.common.endDate= observe.common.endLogValue= observe.common.equation= observe.common.ersId= +observe.common.faoCode= observe.common.file= observe.common.firstName= observe.common.flagCountry= +observe.common.floatingObject= +observe.common.floatline1Length= +observe.common.floatline2Length= +observe.common.floatlineLengths= +observe.common.floatlinesComposition= observe.common.formsUrl= +observe.common.fpaZone= observe.common.gaugeLabel= +observe.common.gear= +observe.common.gearCaracteristic= +observe.common.gearCaracteristicType= observe.common.gearType= +observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesSeine= +observe.common.gender= observe.common.generateReport= observe.common.global.progression.description= +observe.common.gps.activity= +observe.common.gps.gpsPoint= +observe.common.gps.gpsPointInterval= +observe.common.gpsPointInterval= +observe.common.harbour= +observe.common.haulingIdentifier= +observe.common.healthness= observe.common.heureobservation= +observe.common.homeId= observe.common.homeIdFAOWormsId= +observe.common.hookPosition= +observe.common.hookSize= +observe.common.hookType= +observe.common.hooksComposition= +observe.common.id= +observe.common.inconnu= observe.common.iso2Code= observe.common.iso3Code= +observe.common.itemHorizontalPosition= +observe.common.itemVerticalPosition= observe.common.keelCodeFlotte= observe.common.label1= observe.common.label2= @@ -788,10 +844,16 @@ observe.common.length.inf= observe.common.length.observed.tip= observe.common.lengthMeasureType= observe.common.lengthWeightFormula= +observe.common.lengthWeightParameter= observe.common.libelles= +observe.common.lightsticksColor= +observe.common.lightsticksType= +observe.common.lineType= +observe.common.locode= observe.common.longitude= observe.common.lowerValueUpperValue= observe.common.mammalsObservation= +observe.common.maturityStatus= observe.common.meanLength= observe.common.meanLengthComputed.computed.tip= observe.common.meanLengthComputed.observed.tip= @@ -805,30 +867,48 @@ observe.common.measureType.lf= observe.common.measureType.unknown= observe.common.minLengthMax= observe.common.minWeightMax= +observe.common.mitigationType= +observe.common.name= observe.common.needComment= observe.common.nextFpaZone= observe.common.no.balise= +observe.common.nocode= observe.common.nonCoupSenne= observe.common.nonTargetCatch= +observe.common.nonTargetLength= observe.common.nonTargetObservation= observe.common.nonTargetSample= +observe.common.none= observe.common.objectFate= observe.common.objectObservedSpecies= observe.common.objectOperation= +observe.common.objectSchoolEstimate= observe.common.objectType= observe.common.objectsObservation= observe.common.observedSystem= observe.common.observedSystemDistance= observe.common.observer= +observe.common.observerLabel= observe.common.obsolete.entity= observe.common.ocean= +observe.common.ocean/label1= +observe.common.ocean/label2= +observe.common.ocean/label3= +observe.common.ocean/label4= +observe.common.ocean/label5= +observe.common.ocean/label6= +observe.common.ocean/label7= +observe.common.ocean/label8= observe.common.oceanForSpecies= +observe.common.oldCode3L= observe.common.operation.resume= observe.common.organism= observe.common.ownership= +observe.common.person= observe.common.picturesReferences= observe.common.power= observe.common.previousFpaZone= +observe.common.program= observe.common.program.observation.value.0= observe.common.program.observation.value.1= observe.common.program.observation.value.2= @@ -840,8 +920,11 @@ observe.common.program.observation.value.7= observe.common.program.observation.value.8= observe.common.program.observation.value.9= observe.common.reasonForDiscard= +observe.common.reasonForNoFishing= +observe.common.reasonForNullSet= observe.common.reportsUrl= observe.common.resume= +observe.common.route= observe.common.routes.list= observe.common.samplesObservation= observe.common.schoolEstimate= @@ -849,6 +932,7 @@ observe.common.schoolType= observe.common.scientificLabel= observe.common.seaSurfaceTemperature= observe.common.searchMaximum= +observe.common.section= observe.common.select.gps.import.file= observe.common.select.gps.import.file.tip= observe.common.select.gps.maxDelay= @@ -864,11 +948,24 @@ observe.common.select.validate.mode.tip= observe.common.select.validate.scope= observe.common.select.validate.scope.tip= observe.common.selected.validators= +observe.common.sensorBrand= +observe.common.sensorDataFormat= +observe.common.sensorPosition= +observe.common.sensorType= +observe.common.sensorUsed= +observe.common.setLongline= +observe.common.setSeine= +observe.common.settingIdentifier= +observe.common.settingShape= observe.common.sex= +observe.common.sizeMeasure= +observe.common.sizeMeasureType= observe.common.species= +observe.common.species/scientificLabel= observe.common.speciesFate= observe.common.speciesFaune= observe.common.speciesGroup= +observe.common.speciesList= observe.common.speciesStatus= observe.common.speciesThon= observe.common.speedRange= @@ -878,6 +975,7 @@ observe.common.startDateFinValidite= observe.common.startLogValue= observe.common.status= observe.common.step.description= +observe.common.stomacFullness= observe.common.storage.not.valid= observe.common.supportVesselName= observe.common.surroundingActivity= @@ -886,8 +984,12 @@ observe.common.taillePoids.caracteristics= observe.common.targetCatch= observe.common.targetDiscarded= observe.common.targetDiscardsObservation= +observe.common.targetLength= observe.common.targetSample= observe.common.targetSampleCapture= +observe.common.tdr= +observe.common.tdrRecord= +observe.common.time= observe.common.topiaCreateDate= observe.common.topiaId= observe.common.topiaVersion= @@ -895,16 +997,38 @@ observe.common.totalCount= observe.common.totalCountComputed.computed.tip= observe.common.totalCountComputed.observed.tip= observe.common.totalWeight= +observe.common.tracelineLength= +observe.common.transmittingBuoy= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= +observe.common.tripLongline= +observe.common.tripSeine= +observe.common.tripType= observe.common.trips.list= observe.common.typeTransmittingBuoyOperation= observe.common.undefined= observe.common.undefined.tip= observe.common.uri= observe.common.vessel= +observe.common.vessel/label1= +observe.common.vessel/label2= +observe.common.vessel/label3= +observe.common.vessel/label4= +observe.common.vessel/label5= +observe.common.vessel/label6= +observe.common.vessel/label7= +observe.common.vessel/label8= +observe.common.vesselActivityLongline= observe.common.vesselActivitySeine= observe.common.vesselActivitySeine.comment= +observe.common.vesselActivitySeine/label1= +observe.common.vesselActivitySeine/label2= +observe.common.vesselActivitySeine/label3= +observe.common.vesselActivitySeine/label4= +observe.common.vesselActivitySeine/label5= +observe.common.vesselActivitySeine/label6= +observe.common.vesselActivitySeine/label7= +observe.common.vesselActivitySeine/label8= observe.common.vesselSizeCategory= observe.common.vesselSpeed= observe.common.vesselType= @@ -915,6 +1039,8 @@ observe.common.weight.ind= observe.common.weight.observed.tip= observe.common.weightCategory= observe.common.weightLengthFormula= +observe.common.weightMeasure= +observe.common.weightMeasureType= observe.common.well= observe.common.wind= observe.common.yearService= @@ -1134,6 +1260,8 @@ observe.label.usage.referentiel.title= observe.label.weightLengthFormula.info= observe.lengthWeightParameter.tab.general= observe.lengthWeightParameter.tab.other= +observe.list.HookSize= +observe.list.HookType= observe.list.baitHaulingStatus= observe.list.baitSettingStatus= observe.list.baitType= @@ -1281,8 +1409,22 @@ observe.map.legend.hauling= observe.map.legend.setting= observe.map.legend.tripBetweenTwoDays= observe.map.legend.tripDay= +observe.map.longLine.activity= +observe.map.longLine.activity.hauling.end= +observe.map.longLine.activity.hauling.start= +observe.map.longLine.activity.interaction= +observe.map.longLine.activity.setting.end= +observe.map.longLine.activity.setting.start= +observe.map.longLine.activity.station= +observe.map.longLine.seine.harbour= observe.map.miles= observe.map.north= +observe.map.seine.activity= +observe.map.seine.activity.inHarbour= +observe.map.seine.activity.schollType.free= +observe.map.seine.activity.schollType.object= +observe.map.seine.harbour.departure= +observe.map.seine.harbour.landing= observe.map.south= observe.map.waitLoading= observe.map.west= @@ -1598,6 +1740,36 @@ observe.speciesList.selectedSpecies= observe.speciesList.tab.general= observe.speciesList.tab.species= observe.storage.action.canMigrate= +observe.storage.connexionStatut.failed= +observe.storage.connexionStatut.failed.description= +observe.storage.connexionStatut.success= +observe.storage.connexionStatut.success.description= +observe.storage.connexionStatut.untested= +observe.storage.connexionStatut.untested.description= +observe.storage.creationMode.empty= +observe.storage.creationMode.empty.description= +observe.storage.creationMode.externalDump= +observe.storage.creationMode.externalDump.description= +observe.storage.creationMode.importLocalStorage= +observe.storage.creationMode.importLocalStorage.description= +observe.storage.creationMode.importRemoteStorage= +observe.storage.creationMode.importRemoteStorage.description= +observe.storage.creationMode.internalDump= +observe.storage.creationMode.internalDump.description= +observe.storage.dataPolicy.readData= +observe.storage.dataPolicy.readData.description= +observe.storage.dataPolicy.readReferentiel= +observe.storage.dataPolicy.readReferentiel.description= +observe.storage.dataPolicy.writeData= +observe.storage.dataPolicy.writeData.description= +observe.storage.dataPolicy.writeReferentiel= +observe.storage.dataPolicy.writeReferentiel.description= +observe.storage.dbMode.createLocal= +observe.storage.dbMode.createLocal.description= +observe.storage.dbMode.useLocal= +observe.storage.dbMode.useLocal.description= +observe.storage.dbMode.useRemote= +observe.storage.dbMode.useRemote.description= observe.storage.error.dbVersionMismatch= observe.storage.importExternalDump.config= observe.storage.importExternalDump.description= @@ -1626,6 +1798,7 @@ observe.storage.label.synchro= observe.storage.label.synchro.incoming= observe.storage.label.synchro.referentiel= observe.storage.locale.db= +observe.storage.message.provider.detected= observe.storage.no.creationMode= observe.storage.no.creationMode.required= observe.storage.no.dbMode= @@ -1933,6 +2106,8 @@ observe.title.connect.localDB= observe.title.connect.remoteDB= observe.title.consolidate= observe.title.consolidate.tip= +observe.title.content.HookSizes= +observe.title.content.HookTypes= observe.title.content.baitHaulingStatuss= observe.title.content.baitSettingStatuss= observe.title.content.baitTypes= @@ -2139,6 +2314,12 @@ observe.tripSeine.message.updating= observe.tripSeine.tab.general= observe.tripSeine.tab.map= observe.tripSeine.title= +observe.validation.model.type.all= +observe.validation.model.type.all.description= +observe.validation.model.type.data= +observe.validation.model.type.data.description= +observe.validation.model.type.referentiel= +observe.validation.model.type.referentiel.description= observe.validation.report.contextName= observe.validation.report.entities.with.messages= observe.validation.report.entity= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 437f02e..eeccb53 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1,6 +1,19 @@ +nuitonutil.error.convertor.noValue= +nuitonutil.error.float.convertor= +nuitonutil.error.no.convertor= observe.about.message= observe.about.translate.content= observe.about.translate.title= +observe.action.HookSize.create.tip= +observe.action.HookSize.delete.tip= +observe.action.HookSize.detail.tip= +observe.action.HookSize.modify.tip= +observe.action.HookSize.save.tip= +observe.action.HookType.create.tip= +observe.action.HookType.delete.tip= +observe.action.HookType.detail.tip= +observe.action.HookType.modify.tip= +observe.action.HookType.save.tip= observe.action.about= observe.action.about.tip= observe.action.add.floatingObject= @@ -715,11 +728,21 @@ observe.common.acquisitionMode.individu= observe.common.activities= observe.common.activities.list= observe.common.activity= +observe.common.activityLongline= +observe.common.activitySeine= +observe.common.baitHaulingStatus= observe.common.baitObservation= +observe.common.baitSettingStatus= +observe.common.baitType= +observe.common.baitsComposition= +observe.common.basket= observe.common.birdsObservation= observe.common.boolean.false= observe.common.boolean.null= observe.common.boolean.true= +observe.common.branchline= +observe.common.branchlineLength= +observe.common.branchlinesComposition= observe.common.brand= observe.common.brandName= observe.common.broughtOnDeck= @@ -727,6 +750,8 @@ observe.common.capacity= observe.common.capacityLabel= observe.common.captain= observe.common.caracteristics= +observe.common.catchFateLongline= +observe.common.catchLongline= observe.common.catchWeight= observe.common.catchWeightComputed.computed.tip= observe.common.catchWeightComputed.observed.tip= @@ -754,22 +779,53 @@ observe.common.description= observe.common.detailledActivitiesObservation= observe.common.detectionMode= observe.common.directory= +observe.common.encounter= +observe.common.encounterType= observe.common.endDate= observe.common.endLogValue= observe.common.equation= observe.common.ersId= +observe.common.faoCode= observe.common.file= observe.common.firstName= observe.common.flagCountry= +observe.common.floatingObject= +observe.common.floatline1Length= +observe.common.floatline2Length= +observe.common.floatlineLengths= +observe.common.floatlinesComposition= observe.common.formsUrl= +observe.common.fpaZone= observe.common.gaugeLabel= +observe.common.gear= +observe.common.gearCaracteristic= +observe.common.gearCaracteristicType= observe.common.gearType= +observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesSeine= +observe.common.gender= observe.common.generateReport= observe.common.global.progression.description= +observe.common.gps.activity= +observe.common.gps.gpsPoint= +observe.common.gps.gpsPointInterval= +observe.common.gpsPointInterval= +observe.common.harbour= +observe.common.haulingIdentifier= +observe.common.healthness= observe.common.heureobservation= +observe.common.homeId= observe.common.homeIdFAOWormsId= +observe.common.hookPosition= +observe.common.hookSize= +observe.common.hookType= +observe.common.hooksComposition= +observe.common.id= +observe.common.inconnu= observe.common.iso2Code= observe.common.iso3Code= +observe.common.itemHorizontalPosition= +observe.common.itemVerticalPosition= observe.common.keelCodeFlotte= observe.common.label1= observe.common.label2= @@ -788,10 +844,16 @@ observe.common.length.inf= observe.common.length.observed.tip= observe.common.lengthMeasureType= observe.common.lengthWeightFormula= +observe.common.lengthWeightParameter= observe.common.libelles= +observe.common.lightsticksColor= +observe.common.lightsticksType= +observe.common.lineType= +observe.common.locode= observe.common.longitude= observe.common.lowerValueUpperValue= observe.common.mammalsObservation= +observe.common.maturityStatus= observe.common.meanLength= observe.common.meanLengthComputed.computed.tip= observe.common.meanLengthComputed.observed.tip= @@ -805,30 +867,48 @@ observe.common.measureType.lf= observe.common.measureType.unknown= observe.common.minLengthMax= observe.common.minWeightMax= +observe.common.mitigationType= +observe.common.name= observe.common.needComment= observe.common.nextFpaZone= observe.common.no.balise= +observe.common.nocode= observe.common.nonCoupSenne= observe.common.nonTargetCatch= +observe.common.nonTargetLength= observe.common.nonTargetObservation= observe.common.nonTargetSample= +observe.common.none= observe.common.objectFate= observe.common.objectObservedSpecies= observe.common.objectOperation= +observe.common.objectSchoolEstimate= observe.common.objectType= observe.common.objectsObservation= observe.common.observedSystem= observe.common.observedSystemDistance= observe.common.observer= +observe.common.observerLabel= observe.common.obsolete.entity= observe.common.ocean= +observe.common.ocean/label1= +observe.common.ocean/label2= +observe.common.ocean/label3= +observe.common.ocean/label4= +observe.common.ocean/label5= +observe.common.ocean/label6= +observe.common.ocean/label7= +observe.common.ocean/label8= observe.common.oceanForSpecies= +observe.common.oldCode3L= observe.common.operation.resume= observe.common.organism= observe.common.ownership= +observe.common.person= observe.common.picturesReferences= observe.common.power= observe.common.previousFpaZone= +observe.common.program= observe.common.program.observation.value.0= observe.common.program.observation.value.1= observe.common.program.observation.value.2= @@ -840,8 +920,11 @@ observe.common.program.observation.value.7= observe.common.program.observation.value.8= observe.common.program.observation.value.9= observe.common.reasonForDiscard= +observe.common.reasonForNoFishing= +observe.common.reasonForNullSet= observe.common.reportsUrl= observe.common.resume= +observe.common.route= observe.common.routes.list= observe.common.samplesObservation= observe.common.schoolEstimate= @@ -849,6 +932,7 @@ observe.common.schoolType= observe.common.scientificLabel= observe.common.seaSurfaceTemperature= observe.common.searchMaximum= +observe.common.section= observe.common.select.gps.import.file= observe.common.select.gps.import.file.tip= observe.common.select.gps.maxDelay= @@ -864,11 +948,24 @@ observe.common.select.validate.mode.tip= observe.common.select.validate.scope= observe.common.select.validate.scope.tip= observe.common.selected.validators= +observe.common.sensorBrand= +observe.common.sensorDataFormat= +observe.common.sensorPosition= +observe.common.sensorType= +observe.common.sensorUsed= +observe.common.setLongline= +observe.common.setSeine= +observe.common.settingIdentifier= +observe.common.settingShape= observe.common.sex= +observe.common.sizeMeasure= +observe.common.sizeMeasureType= observe.common.species= +observe.common.species/scientificLabel= observe.common.speciesFate= observe.common.speciesFaune= observe.common.speciesGroup= +observe.common.speciesList= observe.common.speciesStatus= observe.common.speciesThon= observe.common.speedRange= @@ -878,6 +975,7 @@ observe.common.startDateFinValidite= observe.common.startLogValue= observe.common.status= observe.common.step.description= +observe.common.stomacFullness= observe.common.storage.not.valid= observe.common.supportVesselName= observe.common.surroundingActivity= @@ -886,8 +984,12 @@ observe.common.taillePoids.caracteristics= observe.common.targetCatch= observe.common.targetDiscarded= observe.common.targetDiscardsObservation= +observe.common.targetLength= observe.common.targetSample= observe.common.targetSampleCapture= +observe.common.tdr= +observe.common.tdrRecord= +observe.common.time= observe.common.topiaCreateDate= observe.common.topiaId= observe.common.topiaVersion= @@ -895,16 +997,38 @@ observe.common.totalCount= observe.common.totalCountComputed.computed.tip= observe.common.totalCountComputed.observed.tip= observe.common.totalWeight= +observe.common.tracelineLength= +observe.common.transmittingBuoy= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= +observe.common.tripLongline= +observe.common.tripSeine= +observe.common.tripType= observe.common.trips.list= observe.common.typeTransmittingBuoyOperation= observe.common.undefined= observe.common.undefined.tip= observe.common.uri= observe.common.vessel= +observe.common.vessel/label1= +observe.common.vessel/label2= +observe.common.vessel/label3= +observe.common.vessel/label4= +observe.common.vessel/label5= +observe.common.vessel/label6= +observe.common.vessel/label7= +observe.common.vessel/label8= +observe.common.vesselActivityLongline= observe.common.vesselActivitySeine= observe.common.vesselActivitySeine.comment= +observe.common.vesselActivitySeine/label1= +observe.common.vesselActivitySeine/label2= +observe.common.vesselActivitySeine/label3= +observe.common.vesselActivitySeine/label4= +observe.common.vesselActivitySeine/label5= +observe.common.vesselActivitySeine/label6= +observe.common.vesselActivitySeine/label7= +observe.common.vesselActivitySeine/label8= observe.common.vesselSizeCategory= observe.common.vesselSpeed= observe.common.vesselType= @@ -915,6 +1039,8 @@ observe.common.weight.ind= observe.common.weight.observed.tip= observe.common.weightCategory= observe.common.weightLengthFormula= +observe.common.weightMeasure= +observe.common.weightMeasureType= observe.common.well= observe.common.wind= observe.common.yearService= @@ -1134,6 +1260,8 @@ observe.label.usage.referentiel.title= observe.label.weightLengthFormula.info= observe.lengthWeightParameter.tab.general= observe.lengthWeightParameter.tab.other= +observe.list.HookSize= +observe.list.HookType= observe.list.baitHaulingStatus= observe.list.baitSettingStatus= observe.list.baitType= @@ -1281,8 +1409,22 @@ observe.map.legend.hauling= observe.map.legend.setting= observe.map.legend.tripBetweenTwoDays= observe.map.legend.tripDay= +observe.map.longLine.activity= +observe.map.longLine.activity.hauling.end= +observe.map.longLine.activity.hauling.start= +observe.map.longLine.activity.interaction= +observe.map.longLine.activity.setting.end= +observe.map.longLine.activity.setting.start= +observe.map.longLine.activity.station= +observe.map.longLine.seine.harbour= observe.map.miles= observe.map.north= +observe.map.seine.activity= +observe.map.seine.activity.inHarbour= +observe.map.seine.activity.schollType.free= +observe.map.seine.activity.schollType.object= +observe.map.seine.harbour.departure= +observe.map.seine.harbour.landing= observe.map.south= observe.map.waitLoading= observe.map.west= @@ -1598,6 +1740,36 @@ observe.speciesList.selectedSpecies= observe.speciesList.tab.general= observe.speciesList.tab.species= observe.storage.action.canMigrate= +observe.storage.connexionStatut.failed= +observe.storage.connexionStatut.failed.description= +observe.storage.connexionStatut.success= +observe.storage.connexionStatut.success.description= +observe.storage.connexionStatut.untested= +observe.storage.connexionStatut.untested.description= +observe.storage.creationMode.empty= +observe.storage.creationMode.empty.description= +observe.storage.creationMode.externalDump= +observe.storage.creationMode.externalDump.description= +observe.storage.creationMode.importLocalStorage= +observe.storage.creationMode.importLocalStorage.description= +observe.storage.creationMode.importRemoteStorage= +observe.storage.creationMode.importRemoteStorage.description= +observe.storage.creationMode.internalDump= +observe.storage.creationMode.internalDump.description= +observe.storage.dataPolicy.readData= +observe.storage.dataPolicy.readData.description= +observe.storage.dataPolicy.readReferentiel= +observe.storage.dataPolicy.readReferentiel.description= +observe.storage.dataPolicy.writeData= +observe.storage.dataPolicy.writeData.description= +observe.storage.dataPolicy.writeReferentiel= +observe.storage.dataPolicy.writeReferentiel.description= +observe.storage.dbMode.createLocal= +observe.storage.dbMode.createLocal.description= +observe.storage.dbMode.useLocal= +observe.storage.dbMode.useLocal.description= +observe.storage.dbMode.useRemote= +observe.storage.dbMode.useRemote.description= observe.storage.error.dbVersionMismatch= observe.storage.importExternalDump.config= observe.storage.importExternalDump.description= @@ -1626,6 +1798,7 @@ observe.storage.label.synchro= observe.storage.label.synchro.incoming= observe.storage.label.synchro.referentiel= observe.storage.locale.db= +observe.storage.message.provider.detected= observe.storage.no.creationMode= observe.storage.no.creationMode.required= observe.storage.no.dbMode= @@ -1933,6 +2106,8 @@ observe.title.connect.localDB= observe.title.connect.remoteDB= observe.title.consolidate= observe.title.consolidate.tip= +observe.title.content.HookSizes= +observe.title.content.HookTypes= observe.title.content.baitHaulingStatuss= observe.title.content.baitSettingStatuss= observe.title.content.baitTypes= @@ -2139,6 +2314,12 @@ observe.tripSeine.message.updating= observe.tripSeine.tab.general= observe.tripSeine.tab.map= observe.tripSeine.title= +observe.validation.model.type.all= +observe.validation.model.type.all.description= +observe.validation.model.type.data= +observe.validation.model.type.data.description= +observe.validation.model.type.referentiel= +observe.validation.model.type.referentiel.description= observe.validation.report.contextName= observe.validation.report.entities.with.messages= observe.validation.report.entity= 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 8970fb9..694cf8b 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 @@ -24,12 +24,12 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.business.ObserveApplicationContext; -import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.services.dto.constants.ReferenceLocaleDto; -import fr.ird.observe.services.dto.longline.BasketImplDto; -import fr.ird.observe.services.dto.longline.SectionImplDto; -import fr.ird.observe.business.validation.ObserveValidator; -import jaxx.runtime.validator.swing.SwingValidator; +import fr.ird.observe.business.ObserveServiceHelper; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +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.service.actions.validate.ObserveValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,9 +41,7 @@ import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; -import javax.swing.JComponent; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; @@ -66,18 +64,19 @@ public class LonglineDetailCompositionValidatorServiceTest { ObserveServiceHelper.close(); ObserveApplicationContext applicationContext = new ObserveApplicationContext(); ObserveServiceHelper.set(applicationContext); - DecoratorService decoratorService = new DecoratorService(ReferenceLocale.FR); + DecoratorService decoratorService = new DecoratorService(ReferentialLocale.FR); - ObserveValidator<Section> sectionValidator = new ObserveValidator<Section>(Section.class, "n1-update-table", NuitonValidatorScope.values()); - ObserveValidator<Basket> basketValidator = new ObserveValidator<Basket>(Basket.class, "n1-update-table", NuitonValidatorScope.values()); - ObserveValidator<Branchline> branchlineValidator = new ObserveValidator<Branchline>(Branchline.class, "n1-update-table", NuitonValidatorScope.values()); + ObserveValidator<SectionDto> sectionValidator = new ObserveValidator<SectionDto>(SectionDto.class, "n1-update-table", NuitonValidatorScope.values()); + ObserveValidator<BasketDto> basketValidator = new ObserveValidator<BasketDto>(BasketDto.class, "n1-update-table", NuitonValidatorScope.values()); + ObserveValidator<BranchlineDto> branchlineValidator = new ObserveValidator<BranchlineDto>(BranchlineDto.class, "n1-update-table", NuitonValidatorScope.values()); - service = new LonglineDetailCompositionUIValidationHelper.LonglineDetailCompositionValidatorService( - sectionValidator, - basketValidator, - branchlineValidator, - Collections.<SwingValidator, JComponent>emptyMap(), - decoratorService); + //FIXME +// service = new LonglineDetailCompositionUIValidationHelper.LonglineDetailCompositionValidatorService( +// sectionValidator, +// basketValidator, +// branchlineValidator, +// Collections.<SwingValidator, JComponent>emptyMap(), +// decoratorService); I18n.init(new ClassPathI18nInitializer(), Locale.FRANCE); @@ -86,15 +85,15 @@ public class LonglineDetailCompositionValidatorServiceTest { @Test public void testValidateSections() { - List<Section> sections = new ArrayList<Section>(); + List<SectionDto> sections = new ArrayList<SectionDto>(); { - Section section = new SectionImpl(); - section.setTopiaId("0"); + SectionDto section = new SectionDto(); + section.setId("0"); sections.add(section); } { - Section section = new SectionImpl(); - section.setTopiaId("1"); + SectionDto section = new SectionDto(); + section.setId("1"); sections.add(section); } @@ -116,23 +115,23 @@ public class LonglineDetailCompositionValidatorServiceTest { { // 2 sections with baskets without settingIdentifier { - Basket basket = new BasketImpl(); - basket.setTopiaId("00"); + BasketDto basket = new BasketDto(); + basket.setId("00"); sections.get(0).addBasket(basket); } { - Basket basket = new BasketImpl(); - basket.setTopiaId("01"); + BasketDto basket = new BasketDto(); + basket.setId("01"); sections.get(0).addBasket(basket); } { - Basket basket = new BasketImpl(); - basket.setTopiaId("10"); + BasketDto basket = new BasketDto(); + basket.setId("10"); sections.get(1).addBasket(basket); } { - Basket basket = new BasketImpl(); - basket.setTopiaId("11"); + BasketDto basket = new BasketDto(); + basket.setId("11"); sections.get(1).addBasket(basket); } List<SwingValidatorMessage> messages = service.validateSections(sections); @@ -140,10 +139,11 @@ public class LonglineDetailCompositionValidatorServiceTest { } { // 2 sections with baskets with settingIdentifier - sections.get(0).getBasket().get(0).setSettingIdentifier(1); - sections.get(0).getBasket().get(1).setSettingIdentifier(2); - sections.get(1).getBasket().get(0).setSettingIdentifier(1); - sections.get(1).getBasket().get(1).setSettingIdentifier(2); + //FIXME +// sections.get(0).getBasket().get(0).setSettingIdentifier(1); +// sections.get(0).getBasket().get(1).setSettingIdentifier(2); +// sections.get(1).getBasket().get(0).setSettingIdentifier(1); +// sections.get(1).getBasket().get(1).setSettingIdentifier(2); List<SwingValidatorMessage> messages = service.validateSections(sections); assertMessages(messages, 0); @@ -152,17 +152,18 @@ public class LonglineDetailCompositionValidatorServiceTest { { // Section 1 - Basket 1 mistmatch floatline1Length with Section 1 - Basket 2 - sections.get(0).getBasket().get(0).setFloatline1Length(1f); - sections.get(0).getBasket().get(0).setFloatline2Length(2f); - - sections.get(0).getBasket().get(1).setFloatline1Length(1f); // should be 2 - sections.get(0).getBasket().get(1).setFloatline2Length(6f); - - sections.get(1).getBasket().get(0).setFloatline1Length(6f); - sections.get(1).getBasket().get(0).setFloatline2Length(11f); - - sections.get(1).getBasket().get(1).setFloatline1Length(11f); - sections.get(1).getBasket().get(1).setFloatline2Length(12f); + //FIXME +// sections.get(0).getBasket().get(0).setFloatline1Length(1f); +// sections.get(0).getBasket().get(0).setFloatline2Length(2f); +// +// sections.get(0).getBasket().get(1).setFloatline1Length(1f); // should be 2 +// sections.get(0).getBasket().get(1).setFloatline2Length(6f); +// +// sections.get(1).getBasket().get(0).setFloatline1Length(6f); +// sections.get(1).getBasket().get(0).setFloatline2Length(11f); +// +// sections.get(1).getBasket().get(1).setFloatline1Length(11f); +// sections.get(1).getBasket().get(1).setFloatline2Length(12f); List<SwingValidatorMessage> messages = service.validateSections(sections); assertMessages(messages, 1); @@ -171,17 +172,18 @@ public class LonglineDetailCompositionValidatorServiceTest { { // OK d'ont check if last floatline has same length of first floatline for next section - sections.get(0).getBasket().get(0).setFloatline1Length(1f); - sections.get(0).getBasket().get(0).setFloatline2Length(2f); - - sections.get(0).getBasket().get(1).setFloatline1Length(2f); - sections.get(0).getBasket().get(1).setFloatline2Length(6f); - - sections.get(1).getBasket().get(0).setFloatline1Length(10f); // Should be 6 - sections.get(1).getBasket().get(0).setFloatline2Length(11f); - - sections.get(1).getBasket().get(1).setFloatline1Length(11f); - sections.get(1).getBasket().get(1).setFloatline2Length(12f); + //FIXME +// sections.get(0).getBasket().get(0).setFloatline1Length(1f); +// sections.get(0).getBasket().get(0).setFloatline2Length(2f); +// +// sections.get(0).getBasket().get(1).setFloatline1Length(2f); +// sections.get(0).getBasket().get(1).setFloatline2Length(6f); +// +// sections.get(1).getBasket().get(0).setFloatline1Length(10f); // Should be 6 +// sections.get(1).getBasket().get(0).setFloatline2Length(11f); +// +// sections.get(1).getBasket().get(1).setFloatline1Length(11f); +// sections.get(1).getBasket().get(1).setFloatline2Length(12f); List<SwingValidatorMessage> messages = service.validateSections(sections); assertMessages(messages, 0); @@ -190,17 +192,18 @@ public class LonglineDetailCompositionValidatorServiceTest { { // Ok - sections.get(0).getBasket().get(0).setFloatline1Length(1f); - sections.get(0).getBasket().get(0).setFloatline2Length(2f); - - sections.get(0).getBasket().get(1).setFloatline1Length(2f); - sections.get(0).getBasket().get(1).setFloatline2Length(10f); - - sections.get(1).getBasket().get(0).setFloatline1Length(10f); - sections.get(1).getBasket().get(0).setFloatline2Length(11f); - - sections.get(1).getBasket().get(1).setFloatline1Length(11f); - sections.get(1).getBasket().get(1).setFloatline2Length(12f); + //FIXME +// sections.get(0).getBasket().get(0).setFloatline1Length(1f); +// sections.get(0).getBasket().get(0).setFloatline2Length(2f); +// +// sections.get(0).getBasket().get(1).setFloatline1Length(2f); +// sections.get(0).getBasket().get(1).setFloatline2Length(10f); +// +// sections.get(1).getBasket().get(0).setFloatline1Length(10f); +// sections.get(1).getBasket().get(0).setFloatline2Length(11f); +// +// sections.get(1).getBasket().get(1).setFloatline1Length(11f); +// sections.get(1).getBasket().get(1).setFloatline2Length(12f); List<SwingValidatorMessage> messages = service.validateSections(sections); assertMessages(messages, 0); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 55646074ce4b4debb9982fe1b89973cf5670ebb1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 15 17:52:07 2015 +0200 ajout de spropiétés date et time dans les models d'ui --- .../ui/content/impl/longline/BranchlineUI.css | 6 +- .../content/impl/longline/BranchlineUIModel.java | 32 +++++ .../ui/content/impl/longline/SetLonglineUI.css | 16 +-- .../content/impl/longline/SetLonglineUIModel.java | 129 +++++++++++++++++++++ .../FloatingObjectTransmittingBuoyOperationUI.css | 6 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 + .../open/impl/longline/ActivityLonglineUI.css | 2 +- .../impl/longline/ActivityLonglineUIModel.java | 11 ++ .../ui/content/open/impl/seine/ActivitySeineUI.css | 9 +- .../open/impl/seine/ActivitySeineUIModel.java | 12 ++ .../table/impl/longline/BaitsCompositionUI.css | 3 +- .../impl/longline/BaitsCompositionUIModel.java | 13 ++- .../ui/content/table/impl/longline/TdrUI.css | 16 +-- .../ui/content/table/impl/longline/TdrUIModel.java | 122 +++++++++++++++++++ 14 files changed, 347 insertions(+), 34 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css index 42f8916..598904c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css @@ -101,10 +101,8 @@ label:{t("observe.branchline.timerTimeOnBoard")}; date:{bean.getTimerTimeOnBoard()}; propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; - //FIXME - //propertyDayDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; - //FIXME - //propertyTimeDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; + propertyDayDate: {BranchlineUIModel.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; + propertyTimeDate: {BranchlineUIModel.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; _validatorLabel:{t("observe.branchline.timerTimeOnBoard")}; } 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 4ecf7b0..aca4e59 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 @@ -26,8 +26,10 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.business.BinderService; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.ui.content.ContentUIModel; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.BinderModelBuilder; +import java.util.Date; import java.util.Set; /** @@ -46,6 +48,10 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { public static final String PROPERTY_HOOK_AND_BAIT_TAB_VALID = "hookAndBaitTabValid"; + public static final String PROPERTY_TIMER_TIME_ON_BOARD_DATE = "timerTimeOnBoardDate"; + + public static final String PROPERTY_TIMER_TIME_ON_BOARD_TIME = "timerTimeOnBoardTime"; + public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(BranchlineDto.PROPERTY_TOP_TYPE, BranchlineDto.PROPERTY_TRACELINE_TYPE, @@ -143,4 +149,30 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { public void fireSaved() { firePropertyChange(PROPERTY_SAVED, null, true); } + + public Date getTimerTimeOnBoardDate() { + Date timerTimeOnBoard = bean.getTimerTimeOnBoard(); + return timerTimeOnBoard == null ? null : DateUtil.getDay(timerTimeOnBoard); + } + + public Date getTimerTimeOnBoardTime() { + Date timerTimeOnBoard = bean.getTimerTimeOnBoard(); + return timerTimeOnBoard == null ? null : DateUtil.getTime(timerTimeOnBoard, false, false); + } + + public void setTimerTimeOnBoardDate(Date date) { + Date timerTimeOnBoard = bean.getTimerTimeOnBoard(); + if (timerTimeOnBoard != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, timerTimeOnBoard, true, false); + bean.setTimerTimeOnBoard(dateAndTime); + } + } + + public void setTimerTimeOnBoardTime(Date time) { + Date timerTimeOnBoard = bean.getTimerTimeOnBoard(); + if (timerTimeOnBoard != null) { + Date dateAndTime = DateUtil.getDateAndTime(timerTimeOnBoard, time, false, false); + bean.setTimerTimeOnBoard(dateAndTime); + } + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css index fb9033f..dca6af3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css @@ -69,8 +69,8 @@ label:{t("observe.setLongline.settingStartTimeStamp")}; date:{bean.getSettingStartTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP}; - //propertyDayDate: {SetLonglineDto.PROPERTY_SETTING_START_DATE}; - //propertyTimeDate: {SetLonglineDto.PROPERTY_SETTING_START_TIME}; + propertyDayDate: {SetLonglineUIModel.PROPERTY_SETTING_START_DATE}; + propertyTimeDate: {SetLonglineUIModel.PROPERTY_SETTING_START_TIME}; _validatorLabel:{t("observe.setLongline.settingStartTimeStamp")}; } @@ -92,8 +92,8 @@ label:{t("observe.setLongline.settingEndTimeStamp")}; date:{bean.getSettingEndTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP}; - //propertyDayDate: {SetLonglineDto.PROPERTY_SETTING_END_DATE}; - //propertyTimeDate: {SetLonglineDto.PROPERTY_SETTING_END_TIME}; + propertyDayDate: {SetLonglineUIModel.PROPERTY_SETTING_END_DATE}; + propertyTimeDate: {SetLonglineUIModel.PROPERTY_SETTING_END_TIME}; _validatorLabel:{t("observe.setLongline.settingEndTimeStamp")}; } @@ -367,8 +367,8 @@ label:{t("observe.setLongline.haulingStartTimeStamp")}; date:{bean.getHaulingStartTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP}; - //propertyDayDate: {SetLonglineDto.PROPERTY_HAULING_START_DATE}; - //propertyTimeDate: {SetLonglineDto.PROPERTY_HAULING_START_TIME}; + propertyDayDate: {SetLonglineUIModel.PROPERTY_HAULING_START_DATE}; + propertyTimeDate: {SetLonglineUIModel.PROPERTY_HAULING_START_TIME}; _validatorLabel:{t("observe.setLongline.haulingStartTimeStamp")}; } @@ -386,8 +386,8 @@ label:{t("observe.setLongline.haulingEndTimeStamp")}; date:{bean.getHaulingEndTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP}; - //propertyDayDate: {SetLonglineDto.PROPERTY_HAULING_END_DATE}; - //propertyTimeDate: {SetLonglineDto.PROPERTY_HAULING_END_TIME}; + propertyDayDate: {SetLonglineUIModel.PROPERTY_HAULING_END_DATE}; + propertyTimeDate: {SetLonglineUIModel.PROPERTY_HAULING_END_TIME}; _validatorLabel:{t("observe.setLongline.haulingEndTimeStamp")}; } 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 9e9b595..2f19f3a 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 @@ -26,8 +26,10 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.business.BinderService; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.BinderModelBuilder; +import java.util.Date; import java.util.Set; /** @@ -44,6 +46,30 @@ public class SetLonglineUIModel extends ContentUIModel<SetLonglineDto> { public static final String PROPERTY_HAULING_TAB_VALID = "haulingTabValid"; + public static final String PROPERTY_SETTING_START_DATE = "settingStartDate"; + + public static final String PROPERTY_SETTING_START_TIME = "settingStartTime"; + + public static final String PROPERTY_SETTING_START_QUADRANT = "settingStartQuadrant"; + + public static final String PROPERTY_SETTING_END_DATE = "settingEndDate"; + + public static final String PROPERTY_SETTING_END_TIME = "settingEndTime"; + + public static final String PROPERTY_SETTING_END_QUADRANT = "settingEndQuadrant"; + + public static final String PROPERTY_HAULING_START_DATE = "haulingStartDate"; + + public static final String PROPERTY_HAULING_START_TIME = "haulingStartTime"; + + public static final String PROPERTY_HAULING_START_QUADRANT = "haulingStartQuadrant"; + + public static final String PROPERTY_HAULING_END_DATE = "haulingEndDate"; + + public static final String PROPERTY_HAULING_END_TIME = "haulingEndTime"; + + public static final String PROPERTY_HAULING_END_QUADRANT = "haulingEndQuadrant"; + public static final Set<String> SETTING_TAB_PROPERTIES = ImmutableSet.<String>builder().add(SetLonglineDto.PROPERTY_HOME_ID, SetLonglineDto.PROPERTY_NUMBER, @@ -202,4 +228,107 @@ public class SetLonglineUIModel extends ContentUIModel<SetLonglineDto> { firePropertyChange(PROPERTY_SETTING_TAB_VALID, null, settingTabValid); } + public Date getSettingStartDate() { + Date settingStartTimeStamp = bean.getSettingStartTimeStamp(); + return settingStartTimeStamp == null ? null : DateUtil.getDay(settingStartTimeStamp); + } + + public Date getSettingStartTime() { + Date settingStartTimeStamp = bean.getSettingStartTimeStamp(); + return settingStartTimeStamp == null ? null : DateUtil.getTime(settingStartTimeStamp, false, false); + } + + public void setSettingStartDate(Date date) { + Date settingStartTimeStamp = bean.getSettingStartTimeStamp(); + if (settingStartTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, settingStartTimeStamp, true, false); + bean.setSettingStartTimeStamp(dateAndTime); + } + } + + public void setSettingStartTime(Date time) { + Date settingStartTimeStamp = bean.getSettingStartTimeStamp(); + if (settingStartTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(settingStartTimeStamp, time, false, false); + bean.setSettingStartTimeStamp(dateAndTime); + } + } + + public Date getSettingEndDate() { + Date settingEndTimeStamp = bean.getSettingEndTimeStamp(); + return settingEndTimeStamp == null ? null : DateUtil.getDay(settingEndTimeStamp); + } + + public Date getSettingEndTime() { + Date settingEndTimeStamp = bean.getSettingEndTimeStamp(); + return settingEndTimeStamp == null ? null : DateUtil.getTime(settingEndTimeStamp, false, false); + } + + public void setSettingEndDate(Date date) { + Date settingEndTimeStamp = bean.getSettingEndTimeStamp(); + if (settingEndTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, settingEndTimeStamp, true, false); + bean.setSettingEndTimeStamp(dateAndTime); + } + } + + public void setSettingEndTime(Date time) { + Date settingEndTimeStamp = bean.getSettingEndTimeStamp(); + if (settingEndTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(settingEndTimeStamp, time, true, false); + bean.setSettingEndTimeStamp(dateAndTime); + } + } + + public Date getHaulingStartDate() { + Date haulingStartTimeStamp = bean.getHaulingStartTimeStamp(); + return haulingStartTimeStamp == null ? null : DateUtil.getDay(haulingStartTimeStamp); + } + + public Date getHaulingStartTime() { + Date haulingStartTimeStamp = bean.getHaulingStartTimeStamp(); + return haulingStartTimeStamp == null ? null : DateUtil.getTime(haulingStartTimeStamp, false, false); + } + + public void setHaulingStartDate(Date date) { + Date haulingStartTimeStamp = bean.getHaulingStartTimeStamp(); + if (haulingStartTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, haulingStartTimeStamp, true, false); + bean.setHaulingStartTimeStamp(dateAndTime); + } + } + + public void setHaulingStartTime(Date time) { + Date haulingStartTimeStamp = bean.getHaulingStartTimeStamp(); + if (haulingStartTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(haulingStartTimeStamp, time, false, false); + bean.setHaulingStartTimeStamp(dateAndTime); + } + } + + public Date getHaulingEndDate() { + Date haulingEndTimeStamp = bean.getHaulingEndTimeStamp(); + return haulingEndTimeStamp == null ? null : DateUtil.getDay(haulingEndTimeStamp); + } + + public Date getHaulingEndTime() { + Date haulingEndTimeStamp = bean.getHaulingEndTimeStamp(); + return haulingEndTimeStamp == null ? null : DateUtil.getTime(haulingEndTimeStamp, false, false); + } + + public void setHaulingEndDate(Date date) { + Date haulingEndTimeStamp = bean.getHaulingEndTimeStamp(); + if (haulingEndTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, haulingEndTimeStamp, true, false); + bean.setHaulingEndTimeStamp(dateAndTime); + } + } + + public void setHaulingEndTime(Date time) { + Date haulingEndTimeStamp = bean.getHaulingEndTimeStamp(); + if (haulingEndTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(haulingEndTimeStamp, time, true, false); + bean.setHaulingEndTimeStamp(dateAndTime); + } + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css index 0946698..d887732 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css @@ -86,8 +86,7 @@ #ownership1 { selectedItem:{transmittingBuoy1.getOwnership()}; - //FIXME - //enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} + enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} } #country1Label { @@ -153,8 +152,7 @@ #ownership2 { selectedItem:{transmittingBuoy2.getOwnership()}; - //FIXME - //enabled: {!getHandler().isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} + enabled: {!getHandler().isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} } #country2Label { 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 d168510..531d780 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 @@ -237,6 +237,10 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH return operation != null && "3".equals(operation.getCode()); } + public boolean isBalisePose(ReferentialReferenceDto<TransmittingBuoyOperationDto> operation) { + return operation != null && "3".equals(operation.getPropertyValue(TransmittingBuoyOperationDto.PROPERTY_CODE)); + } + //FIXME // @Override // protected boolean doSave(FloatingObject bean, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css index 3bb8489..15c47cd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css @@ -99,5 +99,5 @@ actionIcon:add; text:"observe.action.add.setLongline"; toolTipText:"observe.action.add.setLongline.tip"; - enabled:{model.isValid()}; // FIXME && bean.isSetOperation() && bean.getSetLongline() == null}; + enabled:{model.isValid() && model.isSetOperation()}; // FIXME && bean.getSetLongline() == null}; } 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 c7b3b84..50c9211 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 @@ -24,6 +24,8 @@ package fr.ird.observe.ui.content.open.impl.longline; import fr.ird.observe.business.BinderService; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -37,6 +39,9 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong private static final long serialVersionUID = 1L; + //FIXME à mettre ailleurs + private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; + public ActivityLonglineUIModel() { super(ActivityLonglineDto.class); } @@ -71,4 +76,10 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong return builder; } + + public boolean isSetOperation() { + ReferentialReferenceDto<VesselActivityLonglineDto> vesselActivityLongline = bean.getVesselActivityLongline(); + return vesselActivityLongline != null + && VESSEL_ACTIVITY_ID_FOR_SET.equals(vesselActivityLongline.getId()); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css index e0b3214..1503ec8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css @@ -90,8 +90,7 @@ #previousFpaZone { property:{ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE}; selectedItem:{bean.getPreviousFpaZone()}; - //FIXME - //enabled:{bean.isChangedZoneOperation()}; + enabled:{model.isChangedZoneOperation()}; } #currentFpaZoneLabel { @@ -102,8 +101,7 @@ #currentFpaZone { property:{ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE}; selectedItem:{bean.getCurrentFpaZone()}; - //FIXME - //enabled:{!bean.isChangedZoneOperation()}; + enabled:{model.isChangedZoneOperation()}; } #nextFpaZoneLabel { @@ -114,8 +112,7 @@ #nextFpaZone { property:{ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE}; selectedItem:{bean.getNextFpaZone()}; - //FIXME - //enabled:{bean.isChangedZoneOperation()}; + enabled:{model.isChangedZoneOperation()}; } #vesselSpeedLabel { 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 df26c8c..cbb7e4b 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,10 +24,13 @@ package fr.ird.observe.ui.content.open.impl.seine; import com.google.common.collect.ImmutableSet; import fr.ird.observe.business.BinderService; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.BinderModelBuilder; +import java.io.Serializable; import java.util.Set; /** @@ -42,6 +45,9 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt public static final String PROPERTY_MEASUREMENTS_TAB_VALID = "measurementsTabValid"; + //FIXME à mettre ailleurs + public static final String ACTIVITY_CHANGED_ZONE = "21"; + public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(ActivitySeineDto.PROPERTY_TIME, //FIXME @@ -92,6 +98,12 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); } + public boolean isChangedZoneOperation() { + ReferentialReferenceDto<VesselActivitySeineDto> vesselActivitySeine = bean.getVesselActivitySeine(); + Serializable code = vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE); + return vesselActivitySeine != null && ACTIVITY_CHANGED_ZONE.equals(code); + } + @Override protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(BinderService binderService, String binderName) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css index a1e437f..644dd50 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css @@ -84,8 +84,7 @@ } #baitsCompositionProportionSum { - //FIXME - //text:{getStringValue(bean.getBaitsCompositionProportionSum())}; + text:{getStringValue(model.getBaitsCompositionProportionSum())}; _validatorLabel:{t("observe.baitsComposition.proportionSum")}; font-weight:bold; } 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 038587a..9667d33 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 @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -66,5 +65,17 @@ public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineDto, } + public int getBaitsCompositionProportionSum() { + int sum = 0; + //FIXME +// if (!isBaitsCompositionEmpty()) { +// for (BaitsComposition composition : baitsComposition) { +// if (composition.getProportion() != null) { +// sum += composition.getProportion(); +// } +// } +// } + return sum; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css index d7381c7..74c8171 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css @@ -230,8 +230,8 @@ label:{t("observe.tdr.deployementStart")}; date:{tableEditBean.getDeployementStart()}; propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_START}; - //propertyDayDate: {TdrDto.PROPERTY_DEPLOYEMENT_START_DATE}; - //propertyTimeDate: {TdrDto.PROPERTY_DEPLOYEMENT_START_TIME}; + propertyDayDate: {TdrUIModel.PROPERTY_DEPLOYEMENT_START_DATE}; + propertyTimeDate: {TdrUIModel.PROPERTY_DEPLOYEMENT_START_TIME}; _validatorLabel: {t("observe.tdr.deployementStart")}; } @@ -239,8 +239,8 @@ label:{t("observe.tdr.deployementEnd")}; date:{tableEditBean.getDeployementEnd()}; propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_END}; - //propertyDayDate: {TdrDto.PROPERTY_DEPLOYEMENT_END_DATE}; - //propertyTimeDate: {TdrDto.PROPERTY_DEPLOYEMENT_END_TIME}; + propertyDayDate: {TdrUIModel.PROPERTY_DEPLOYEMENT_END_DATE}; + propertyTimeDate: {TdrUIModel.PROPERTY_DEPLOYEMENT_END_TIME}; _validatorLabel: {t("observe.tdr.deployementEnd")}; } @@ -248,8 +248,8 @@ label:{t("observe.tdr.fishingStart")}; date:{tableEditBean.getFishingStart()}; propertyDate: {TdrDto.PROPERTY_FISHING_START}; - //propertyDayDate: {TdrDto.PROPERTY_FISHING_START_DATE}; - //propertyTimeDate: {TdrDto.PROPERTY_FISHING_START_TIME}; + propertyDayDate: {TdrUIModel.PROPERTY_FISHING_START_DATE}; + propertyTimeDate: {TdrUIModel.PROPERTY_FISHING_START_TIME}; _validatorLabel: {t("observe.tdr.fishingStart")}; } @@ -257,8 +257,8 @@ label:{t("observe.tdr.fishingEnd")}; date:{tableEditBean.getFishingEnd()}; propertyDate: {TdrDto.PROPERTY_FISHING_END}; - //propertyDayDate: {TdrDto.PROPERTY_FISHING_END_DATE}; - //propertyTimeDate: {TdrDto.PROPERTY_FISHING_END_TIME}; + propertyDayDate: {TdrUIModel.PROPERTY_FISHING_END_DATE}; + propertyTimeDate: {TdrUIModel.PROPERTY_FISHING_END_TIME}; _validatorLabel: {t("observe.tdr.fishingEnd")}; } 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 6b561ca..0040110 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 @@ -30,9 +30,11 @@ 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; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; +import java.util.Date; import java.util.List; import java.util.Set; @@ -104,6 +106,22 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineDto, TdrDto> { public static final String PROPERTY_SPECIES_TAB_VALID = "speciesTabValid"; + public static final String PROPERTY_DEPLOYEMENT_START_DATE = "deployementStartDate"; + + public static final String PROPERTY_DEPLOYEMENT_START_TIME = "deployementStartTime"; + + public static final String PROPERTY_DEPLOYEMENT_END_DATE = "deployementEndDate"; + + public static final String PROPERTY_DEPLOYEMENT_END_TIME = "deployementEndTime"; + + public static final String PROPERTY_FISHING_START_DATE = "fishingStartDate"; + + public static final String PROPERTY_FISHING_START_TIME = "fishingStartTime"; + + public static final String PROPERTY_FISHING_END_DATE = "fishingEndDate"; + + public static final String PROPERTY_FISHING_END_TIME = "fishingEndTime"; + private static final long serialVersionUID = 1L; protected boolean caracteristicsTabValid; @@ -242,4 +260,108 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineDto, TdrDto> { this.timestampTabValid = timestampTabValid; firePropertyChange(PROPERTY_TIMESTAMP_TAB_VALID, null, timestampTabValid); } + + public Date getDeployementStartDate() { + Date deployementStart = tableEditBean.getDeployementStart(); + return deployementStart == null ? null : DateUtil.getDay(deployementStart); + } + + public Date getDeployementStartTime() { + Date deployementStart = tableEditBean.getDeployementStart(); + return deployementStart == null ? null : DateUtil.getTime(deployementStart, false, false); + } + + public Date getDeployementEndDate() { + Date deployementEnd = tableEditBean.getDeployementEnd(); + return deployementEnd == null ? null : DateUtil.getDay(deployementEnd); + } + + public Date getDeployementEndTime() { + Date deployementEnd = tableEditBean.getDeployementEnd(); + return deployementEnd == null ? null : DateUtil.getTime(deployementEnd, false, false); + } + + public Date getFishingStartDate() { + Date fishingStart = tableEditBean.getFishingStart(); + return fishingStart == null ? null : DateUtil.getDay(fishingStart); + } + + public Date getFishingStartTime() { + Date fishingStart = tableEditBean.getFishingStart(); + return fishingStart == null ? null : DateUtil.getTime(fishingStart, false, false); + } + + public Date getFishingEndDate() { + Date fishingEnd = tableEditBean.getFishingEnd(); + return fishingEnd == null ? null : DateUtil.getDay(fishingEnd); + } + + public Date getFishingEndTime() { + Date fishingEnd = tableEditBean.getFishingEnd(); + return fishingEnd == null ? null : DateUtil.getTime(fishingEnd, false, false); + } + + public void setDeployementStartDate(Date date) { + Date deployementStart = tableEditBean.getDeployementStart(); + if (deployementStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, deployementStart, true, false); + tableEditBean.setDeployementStart(dateAndTime); + } + } + + public void setDeployementStartTime(Date time) { + Date deployementStart = tableEditBean.getDeployementStart(); + if (deployementStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(deployementStart, time, false, false); + tableEditBean.setDeployementStart(dateAndTime); + } + } + + public void setDeployementEndDate(Date date) { + Date deployementEnd = tableEditBean.getDeployementEnd(); + if (deployementEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, deployementEnd, true, false); + tableEditBean.setDeployementEnd(dateAndTime); + } + } + + public void setDeployementEndTime(Date time) { + Date deployementEnd = tableEditBean.getDeployementEnd(); + if (deployementEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(deployementEnd, time, false, false); + tableEditBean.setDeployementEnd(dateAndTime); + } + } + + public void setFishingStartDate(Date date) { + Date fishingStart = tableEditBean.getFishingStart(); + if (fishingStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, fishingStart, true, false); + tableEditBean.setFishingStart(dateAndTime); + } + } + + public void setFishingStartTime(Date time) { + Date fishingStart = tableEditBean.getFishingStart(); + if (fishingStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(fishingStart, time, false, false); + tableEditBean.setFishingStart(dateAndTime); + } + } + + public void setFishingEndDate(Date date) { + Date fishingEnd = tableEditBean.getFishingEnd(); + if (fishingEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, fishingEnd, true, false); + tableEditBean.setFishingEnd(dateAndTime); + } + } + + public void setFishingEndTime(Date time) { + Date fishingEnd = tableEditBean.getFishingEnd(); + if (fishingEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(fishingEnd, time, false, false); + tableEditBean.setFishingEnd(dateAndTime); + } + } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b366dd9f4582117fd1b8bf5085620e7799af9aa8 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 15 18:07:07 2015 +0200 fix predicates --- .../ird/observe/ui/content/open/impl/longline/TripLonglineUI.css | 7 +++---- .../fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css index ec27bed..8a86a12 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css @@ -60,8 +60,8 @@ NumberEditor { #captain { property:{TripLonglineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - //FIXME - //_listPredicate:{PersonDtos.newCaptainPredicate()}; + FIXME + _listPredicate:{PersonDtos.newCaptainPredicate(true)}; } #dataEntryOperatorLabel { @@ -72,8 +72,7 @@ NumberEditor { #dataEntryOperator { property:{TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - //FIXME - //_listPredicate:{PersonDtos.newDataEntryOperatorPredicate()}; + _listPredicate:{PersonDtos.newDataEntryOperatorPredicate(true)}; } #tripTypeLabel{ diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css index f6f99a1..c125cc0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css @@ -52,8 +52,7 @@ NumberEditor { #observer { property:{TripSeineDto.PROPERTY_OBSERVER}; selectedItem:{bean.getObserver()}; - //FIXME - //_listPredicate:{PersonDtos.newObserverPredicate()}; + _listPredicate:{PersonDtos.newObserverPredicate(true)}; } #captainLabel { @@ -64,8 +63,7 @@ NumberEditor { #captain { property:{TripSeineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - //FIXME - //_listPredicate:{PersonDtos.newCaptainPredicate()}; + _listPredicate:{PersonDtos.newCaptainPredicate(true)}; } #dataEntryOperatorLabel { @@ -76,8 +74,7 @@ NumberEditor { #dataEntryOperator { property:{TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - //FIXME - //_listPredicate:{PersonDtos.newDataEntryOperatorPredicate()}; + _listPredicate:{PersonDtos.newDataEntryOperatorPredicate(true)}; } #vesselLabel { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.