This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 86666a581338524c1d4bf38cbc81acea1f4cb45b Merge: 82b701f 905a69b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 25 15:44:26 2016 +0100 Retour sur develop même s'il reste 2, 3 choses à revoir Merge branch 'feature/8429' into develop .../swing/decoration/DecoratorService.java | 8 +- .../CoordinateLatitudeDtoFieldValidator.java | 4 + .../CoordinateLongitudeDtoFieldValidator.java | 4 + .../swing/ObserveSwingApplicationContext.java | 104 +- .../ObserveSwingApplicationDataSourcesManager.java | 12 +- .../swing/db/ObserveSwingDataSource.java | 21 +- .../application/swing/ui/BorderFocusListener.java | 50 + .../application/swing/ui/ObserveMainUI.jaxx | 39 +- .../application/swing/ui/ObserveMainUI.jcss | 16 +- .../application/swing/ui/ObserveMainUIHandler.java | 232 +++-- .../ui/actions/ImportStorageFromFileAction.java | 4 +- .../swing/ui/actions/ReloadStorageAction.java | 7 +- .../actions/content/AbstractContentUIAction.java | 32 + .../{shared => content}/CancelCreateUIAction.java | 35 +- .../ui/actions/content/CloseAndCreateUIAction.java | 154 +++ .../ui/actions/content/CloseOpenUIAction.java | 125 +++ .../ui/actions/content/CreateOpenUIAction.java | 29 + .../{shared => content}/DeleteDataUIAction.java | 27 +- .../DeleteReferenceUIAction.java | 37 +- .../actions/content/DeleteTableEntryUIAction.java | 29 + .../MoveActivityLonglinesUIAction.java | 103 +- .../MoveActivitySeinesUIAction.java | 108 +- .../{shared => content}/MoveRoutesUIAction.java | 99 +- .../MoveTripLonglinesUIAction.java | 24 +- .../MoveTripSeinesUIAction.java | 24 +- .../{shared => content}/MoveTripsUIAction.java | 103 +- .../ui/actions/content/NewTableEntryUIAction.java | 30 + .../swing/ui/actions/content/ReOpenUIAction.java | 90 ++ .../{shared => content}/ResetEditUIAction.java | 31 +- .../actions/content/ResetTableEntryUIAction.java | 40 + .../{shared => content}/SaveEditUIAction.java | 27 +- .../ui/actions/content/SaveTableEntryUIAction.java | 40 + .../ui/actions/global/AbstractGlobalUIAction.java | 18 + .../actions/global/ChangeFocusGlobalUIAction.java | 60 ++ .../actions/global/DeleteDataGlobalUIAction.java | 45 + .../actions/global/NewNextDataGlobalUIAction.java | 45 + .../global/OpenCloseDataGlobalUIAction.java | 76 ++ .../ui/actions/global/ResetDataGlobalUIAction.java | 38 + .../ui/actions/global/SaveDataGlobalUIAction.java | 38 + .../swing/ui/actions/shared/AbstractUIAction.java | 130 ++- .../ui/actions/shared/CloseAndCreateUIAction.java | 157 --- .../swing/ui/actions/shared/CloseOpenUIAction.java | 173 ---- .../swing/ui/actions/shared/GoDownUIAction.java | 54 +- .../swing/ui/actions/shared/GoUpUIAction.java | 36 +- .../swing/ui/actions/shared/ReOpenUIAction.java | 103 -- .../ui/actions/shared/SelectNodeUIAction.java | 9 +- .../ui/actions/shared/SelectOpenNodeUIAction.java | 20 +- .../swing/ui/admin/AdminTabUIHandler.java | 74 +- .../application/swing/ui/admin/AdminUIHandler.java | 31 + .../application/swing/ui/admin/AdminUIModel.java | 216 ++-- .../swing/ui/admin/config/ConfigUI.jaxx | 3 +- .../swing/ui/admin/config/ConfigUIHandler.java | 28 +- .../swing/ui/admin/config/SelectDataUI.jaxx | 40 +- .../swing/ui/admin/config/SelectDataUI.jcss | 19 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 44 +- .../swing/ui/admin/export/ExportModel.java | 65 +- .../swing/ui/admin/export/ExportUIHandler.java | 23 +- .../swing/ui/admin/report/ReportUIHandler.java | 26 +- .../admin/synchronize/data/DataSynchroModel.java | 40 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 45 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 33 +- .../ui/admin/synchronize/data/DataSynchroUI.jcss | 22 - .../synchronize/data/DataSynchroUIHandler.java | 93 +- .../referential/ng/ReferentialSynchroUI.jaxx | 4 - .../swing/ui/admin/validate/ValidateUI.jaxx | 4 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 82 +- .../application/swing/ui/content/Common.jcss | 4 + .../application/swing/ui/content/ContentUI.jaxx | 11 +- .../application/swing/ui/content/ContentUI.jcss | 2 + .../swing/ui/content/ContentUIBlockingLayerUI.java | 111 +++ .../swing/ui/content/ContentUIHandler.java | 182 ++-- .../swing/ui/content/ContentUIInitializer.java | 81 +- .../swing/ui/content/ContentUIManager.java | 284 +----- .../swing/ui/content/ContentUIModel.java | 4 +- .../swing/ui/content/ObserveActionMap.java | 120 +++ .../swing/ui/content/ObserveContentUI.java | 2 +- .../swing/ui/content/ObserveFocusManager.java | 1036 ++++++++++++++++++++ .../ui/content/impl/longline/BranchlineUI.jaxx | 34 +- .../content/impl/longline/BranchlineUIHandler.java | 12 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 16 +- .../LonglineDetailCompositionUIHandler.java | 26 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 16 +- .../LonglineGlobalCompositionUIHandler.java | 20 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 30 +- .../impl/longline/SetLonglineUIHandler.java | 18 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 61 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 17 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 32 +- .../impl/seine/FloatingObjectUIHandler.java | 24 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 16 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 32 +- .../swing/ui/content/list/ContentListUI.jaxx | 26 +- .../swing/ui/content/list/ContentListUI.jcss | 9 +- .../ui/content/list/ContentListUIHandler.java | 59 +- .../list/impl/longline/ActivityLonglinesUI.jaxx | 17 +- .../list/impl/longline/ActivityLonglinesUI.jcss | 7 +- .../impl/longline/ActivityLonglinesUIHandler.java | 11 +- .../content/list/impl/longline/CommonListUI.jcss | 4 + .../list/impl/longline/TripLonglinesUI.jaxx | 10 +- .../list/impl/longline/TripLonglinesUI.jcss | 8 +- .../list/impl/longline/TripLonglinesUIHandler.java | 13 +- .../content/list/impl/seine/ActivitySeinesUI.jaxx | 14 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 11 +- .../ui/content/list/impl/seine/CommonListUI.jcss | 4 + .../swing/ui/content/list/impl/seine/RoutesUI.jaxx | 10 +- .../content/list/impl/seine/RoutesUIHandler.java | 8 +- .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 10 +- .../list/impl/seine/TripSeinesUIHandler.java | 11 +- .../swing/ui/content/open/ContentOpenableUI.jaxx | 31 +- .../swing/ui/content/open/ContentOpenableUI.jcss | 13 +- .../ui/content/open/ContentOpenableUIHandler.java | 55 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 18 +- .../impl/longline/ActivityLonglineUIHandler.java | 11 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 49 +- .../open/impl/longline/TripLonglineUIHandler.java | 7 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 7 +- .../open/impl/seine/ActivitySeineUIHandler.java | 11 +- .../swing/ui/content/open/impl/seine/RouteUI.jaxx | 16 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 69 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 27 +- .../open/impl/seine/TripSeineUIHandler.java | 20 +- ...itySeineUI.jaxx => ContentI18nReferenceUI.jaxx} | 70 +- .../ui/content/ref/ContentI18nReferenceUI.jcss | 71 ++ .../swing/ui/content/ref/ContentReferenceUI.jaxx | 36 +- .../swing/ui/content/ref/ContentReferenceUI.jcss | 1 + .../ui/content/ref/ContentReferenceUIHandler.java | 40 +- .../swing/ui/content/ref/ReferenceHomeUI.jaxx | 7 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 4 +- .../swing/ui/content/ref/ReferenceHomeUIModel.java | 2 +- .../ref/ReferentialContentUIInitializer.java | 13 +- .../swing/ui/content/ref/UniqueKeyTableModel.java | 2 +- .../swing/ui/content/ref/impl/CountryUI.jaxx | 97 +- .../swing/ui/content/ref/impl/CountryUIModel.java | 2 +- .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 95 +- .../swing/ui/content/ref/impl/FpaZoneUIModel.java | 2 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 95 +- .../ref/impl/GearCaracteristicTypeUIModel.java | 2 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 97 +- .../content/ref/impl/GearCaracteristicUIModel.java | 4 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 25 +- .../swing/ui/content/ref/impl/GearUI.jcss | 4 - .../swing/ui/content/ref/impl/GearUIHandler.java | 9 +- .../swing/ui/content/ref/impl/GearUIModel.java | 2 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 27 +- .../swing/ui/content/ref/impl/HarbourUIModel.java | 22 +- .../ui/content/ref/impl/I18nReferenceEntity.jcss | 92 -- .../content/ref/impl/LengthLengthParameterUI.jaxx | 7 +- .../ref/impl/LengthLengthParameterUIHandler.java | 7 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 7 +- .../ref/impl/LengthWeightParameterUIHandler.java | 9 +- .../ref/impl/LengthWeightParameterUIModel.java | 3 +- .../ref/impl/NeedCommentReferenceEntity.jcss | 25 - .../swing/ui/content/ref/impl/OceanUI.jaxx | 96 +- .../swing/ui/content/ref/impl/OceanUIModel.java | 2 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 98 +- .../swing/ui/content/ref/impl/OrganismUIModel.java | 2 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 23 +- .../swing/ui/content/ref/impl/PersonUIModel.java | 14 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 41 +- .../swing/ui/content/ref/impl/ProgramUI.jcss | 4 - .../ui/content/ref/impl/ProgramUIHandler.java | 9 +- .../swing/ui/content/ref/impl/ProgramUIModel.java | 2 +- .../swing/ui/content/ref/impl/ReferenceEntity.jcss | 3 + .../swing/ui/content/ref/impl/SexUI.jaxx | 95 +- .../swing/ui/content/ref/impl/SexUIModel.java | 2 +- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 24 +- .../ui/content/ref/impl/SizeMeasureTypeUI.jaxx | 92 +- .../content/ref/impl/SizeMeasureTypeUIModel.java | 2 +- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 97 +- .../ui/content/ref/impl/SpeciesGroupUIModel.java | 2 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 29 +- .../swing/ui/content/ref/impl/SpeciesListUI.jcss | 4 - .../ui/content/ref/impl/SpeciesListUIHandler.java | 9 +- .../ui/content/ref/impl/SpeciesListUIModel.java | 2 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 19 +- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 4 - .../ui/content/ref/impl/SpeciesUIHandler.java | 9 +- .../swing/ui/content/ref/impl/SpeciesUIModel.java | 22 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 30 +- .../ref/impl/VesselSizeCategoryUIModel.java | 2 +- .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 28 +- .../ui/content/ref/impl/VesselTypeUIModel.java | 2 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 38 +- .../swing/ui/content/ref/impl/VesselUI.jcss | 4 - .../swing/ui/content/ref/impl/VesselUIHandler.java | 9 +- .../ui/content/ref/impl/WeightMeasureTypeUI.jaxx | 93 +- .../content/ref/impl/WeightMeasureTypeUIModel.java | 2 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 95 +- .../impl/longline/BaitHaulingStatusUIModel.java | 2 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 97 +- .../impl/longline/BaitSettingStatusUIModel.java | 2 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 94 +- .../content/ref/impl/longline/BaitTypeUIModel.java | 2 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 95 +- .../impl/longline/CatchFateLonglineUIModel.java | 2 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 95 +- .../ref/impl/longline/EncounterTypeUIModel.java | 2 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 94 +- .../ref/impl/longline/HealthnessUIModel.java | 2 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 95 +- .../ref/impl/longline/HookPositionUIModel.java | 2 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 94 +- .../content/ref/impl/longline/HookSizeUIModel.java | 2 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 96 +- .../content/ref/impl/longline/HookTypeUIModel.java | 2 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 95 +- .../longline/ItemHorizontalPositionUIModel.java | 2 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 95 +- .../impl/longline/ItemVerticalPositionUIModel.java | 2 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 95 +- .../ref/impl/longline/LightsticksColorUIModel.java | 2 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 95 +- .../ref/impl/longline/LightsticksTypeUIModel.java | 2 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 94 +- .../content/ref/impl/longline/LineTypeUIModel.java | 2 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 98 +- .../ref/impl/longline/MaturityStatusUIModel.java | 2 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 95 +- .../ref/impl/longline/MitigationTypeUIModel.java | 2 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 24 +- .../ref/impl/longline/SensorBrandUIModel.java | 2 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 95 +- .../ref/impl/longline/SensorDataFormatUIModel.java | 2 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 94 +- .../ref/impl/longline/SensorTypeUIModel.java | 2 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 95 +- .../ref/impl/longline/SettingShapeUIModel.java | 2 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 95 +- .../ref/impl/longline/StomacFullnessUIModel.java | 2 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 94 +- .../content/ref/impl/longline/TripTypeUIModel.java | 2 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 95 +- .../longline/VesselActivityLonglineUIModel.java | 2 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 95 +- .../ref/impl/seine/DetectionModeUIModel.java | 2 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 93 +- .../content/ref/impl/seine/ObjectFateUIModel.java | 2 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 96 +- .../ref/impl/seine/ObjectOperationUIModel.java | 2 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 93 +- .../content/ref/impl/seine/ObjectTypeUIModel.java | 2 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 97 +- .../ref/impl/seine/ObservedSystemUIModel.java | 2 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 96 +- .../ref/impl/seine/ReasonForDiscardUIModel.java | 2 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 99 +- .../ref/impl/seine/ReasonForNoFishingUIModel.java | 2 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 94 +- .../ref/impl/seine/ReasonForNullSetUIModel.java | 2 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 78 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 94 +- .../ref/impl/seine/SpeciesStatusUIModel.java | 2 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 94 +- .../ref/impl/seine/SurroundingActivityUIModel.java | 2 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 96 +- .../seine/TransmittingBuoyOperationUIModel.java | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 93 +- .../impl/seine/TransmittingBuoyTypeUIModel.java | 2 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 80 +- .../ref/impl/seine/VesselActivitySeineUIModel.java | 3 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 94 +- .../ref/impl/seine/WeightCategoryUIModel.java | 2 +- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 98 +- .../ui/content/ref/impl/seine/WindUIModel.java | 2 +- .../swing/ui/content/table/CommonTable.jcss | 4 + .../swing/ui/content/table/ContentTableModel.java | 7 +- .../swing/ui/content/table/ContentTableUI.jaxx | 33 +- .../swing/ui/content/table/ContentTableUI.jcss | 31 +- .../ui/content/table/ContentTableUIHandler.java | 138 +-- .../content/table/ContentTableUIInitializer.java | 11 +- .../ui/content/table/ContentTableUIModel.java | 6 +- .../ui/content/table/ObserveContentTableUI.java | 10 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 19 +- .../impl/longline/BaitsCompositionUIHandler.java | 10 +- .../impl/longline/BaitsCompositionUIModel.java | 20 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 19 +- .../longline/BranchlinesCompositionUIHandler.java | 10 +- .../longline/BranchlinesCompositionUIModel.java | 20 +- .../impl/longline/CatchLonglineTableModel.java | 3 +- .../table/impl/longline/CatchLonglineUI.jaxx | 59 +- .../impl/longline/CatchLonglineUIHandler.java | 32 +- .../table/impl/longline/CatchLonglineUIModel.java | 58 +- .../content/table/impl/longline/EncounterUI.jaxx | 14 +- .../table/impl/longline/EncounterUIHandler.java | 13 +- .../table/impl/longline/EncounterUIModel.java | 12 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 16 +- .../longline/FloatlinesCompositionUIHandler.java | 10 +- .../longline/FloatlinesCompositionUIModel.java | 17 +- .../GearUseFeaturesLonglineTableModel.java | 8 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 25 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 9 +- .../longline/GearUseFeaturesLonglineUIModel.java | 10 +- .../table/impl/longline/HooksCompositionUI.jaxx | 20 +- .../impl/longline/HooksCompositionUIHandler.java | 8 +- .../impl/longline/HooksCompositionUIModel.java | 19 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 18 +- .../table/impl/longline/SensorUsedUIHandler.java | 16 +- .../table/impl/longline/SensorUsedUIModel.java | 23 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 27 +- .../content/table/impl/longline/TdrUIHandler.java | 13 +- .../ui/content/table/impl/longline/TdrUIModel.java | 5 +- .../table/impl/seine/AbstractSampleUIHandler.java | 6 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 25 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 9 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 24 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 45 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 7 +- .../table/impl/seine/NonTargetCatchUIModel.java | 12 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 15 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 7 +- .../table/impl/seine/NonTargetSampleUIModel.java | 23 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 31 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 13 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 13 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 31 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 13 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 13 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 24 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 15 +- .../table/impl/seine/SchoolEstimateUIModel.java | 19 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 27 +- .../table/impl/seine/TargetCatchUIHandler.java | 13 +- .../table/impl/seine/TargetCatchUIModel.java | 27 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 33 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 7 +- .../impl/seine/TargetDiscardCatchUIModel.java | 27 +- .../table/impl/seine/TargetSampleCaptureUI.jaxx | 7 +- .../table/impl/seine/TargetSampleRejeteUI.jaxx | 7 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 17 +- .../table/impl/seine/TargetSampleUIHandler.java | 10 +- .../table/impl/seine/TargetSampleUIModel.java | 4 +- .../swing/ui/storage/ObstunaAdminAction.java | 53 +- .../swing/ui/storage/StorageBackupUILauncher.java | 30 +- .../swing/ui/storage/StorageUIHandler.java | 192 ++-- .../swing/ui/storage/StorageUILauncher.java | 192 +--- .../swing/ui/storage/StorageUIModel.java | 105 +- .../swing/ui/storage/tabs/ChooseDbModeUI.jcss | 2 +- .../swing/ui/storage/tabs/ConfigUI.jaxx | 93 +- .../swing/ui/storage/tabs/DataSelectionModel.java | 619 ------------ .../swing/ui/storage/tabs/SelectDataUI.jaxx | 24 +- .../swing/ui/storage/tabs/SelectDataUI.jcss | 6 - .../swing/ui/storage/tabs/StorageTabUIHandler.java | 99 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 709 -------------- .../ui/tree/NavigationTreeSelectionModel.java | 118 --- .../swing/ui/tree/ObserveDataProvider.java | 83 -- .../tree/ObserveNavigationTreeShowPopupAction.java | 54 +- .../swing/ui/tree/ObserveTreeBridge.java | 142 --- .../swing/ui/tree/ObserveTreeHelper.java | 633 ------------ .../swing/ui/tree/ObserveTreeNodeSupport.java | 39 + .../actions/ChangeActivityRouteActionListener.java | 25 +- .../actions/ChangeActivityTripActionListener.java | 25 +- .../actions/ChangeRouteTripActionListener.java | 25 +- .../actions/ChangeTripProgramActionListener.java | 23 +- .../ui/tree/actions/NodeChangeActionListener.java | 36 +- .../loadors/AbstractDataReferenceChildLoador.java | 39 - .../ui/tree/loadors/AbstractNodeChildLoador.java | 95 -- .../loadors/ActivityLonglineNodeChildLoador.java | 109 -- .../loadors/ActivityLonglinesNodeChildLoador.java | 64 -- .../tree/loadors/ActivitySeineNodeChildLoador.java | 97 -- .../loadors/ActivitySeinesNodeChildLoador.java | 66 -- .../loadors/FloatingObjectNodeChildLoador.java | 60 -- .../loadors/ProgramLonglineNodeChildLoador.java | 126 --- .../tree/loadors/ProgramSeineNodeChildLoador.java | 119 --- .../ui/tree/loadors/ReferenceNodeChildLoador.java | 80 -- .../swing/ui/tree/loadors/RootNodeChildLoador.java | 148 --- .../ui/tree/loadors/RoutesNodeChildLoador.java | 70 -- .../tree/loadors/SetLonglineNodeChildLoador.java | 67 -- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 76 -- .../MoveActivityLonglineNodeMenuPopulator.java | 29 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 29 +- .../swing/ui/tree/menu/MoveNodeMenuPopulator.java | 18 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 29 +- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 41 +- .../swing/ui/tree/navigation/NavigationTree.java | 524 ++++++++++ .../navigation/NavigationTreeCellRenderer.java | 69 ++ .../ui/tree/navigation/NavigationTreeHeader.jaxx | 45 + .../ui/tree/navigation/NavigationTreeHeader.jcss | 53 + .../navigation/NavigationTreeHeaderHandler.java | 106 ++ .../ui/tree/navigation/NavigationTreeModel.java | 148 +++ .../navigation/nodes/ClassNavigationTreeNode.java | 57 ++ .../nodes/NavigationTreeNodeSupport.java | 117 +++ .../nodes/ReferenceNavigationTreeNodeSupport.java | 45 + .../navigation/nodes/RootNavigationTreeNode.java | 42 + .../nodes/StringNavigationTreeNodeSupport.java | 52 + .../ActivitiesLonglineNavigationTreeNode.java | 57 ++ .../ActivityLonglineNavigationTreeNode.java | 71 ++ .../longline/CatchLonglineNavigationTreeNode.java | 28 + .../EncounterLonglineNavigationTreeNode.java | 28 + .../GearUseFeaturesLonglineNavigationTreeNode.java | 34 + .../ProgramLonglineNavigationTreeNode.java | 48 + .../SensorUsedLonglineNavigationTreeNode.java | 28 + ...etailCompositionLonglineNavigationTreeNode.java | 28 + ...lobalCompositionLonglineNavigationTreeNode.java | 28 + .../longline/SetLonglineNavigationTreeNode.java | 38 + .../longline/TdrLonglineNavigationTreeNode.java | 28 + .../longline/TripLonglineNavigationTreeNode.java | 47 + .../referential/ReferentialNavigationTreeNode.java | 59 ++ .../ReferentialsNavigationTreeNode.java | 51 + .../seine/ActivitiesSeineNavigationTreeNode.java | 62 ++ .../seine/ActivitySeineNavigationTreeNode.java | 56 ++ ...cardedTargetCatchesSeineNavigationTreeNode.java | 28 + ...cardedTargetSamplesSeineNavigationTreeNode.java | 28 + .../FloatingObjectSeineNavigationTreeNode.java | 35 + .../GearUseFeaturesSeineNavigationTreeNode.java | 34 + .../KeptTargetCatchesSeineNavigationTreeNode.java | 29 + .../KeptTargetSamplesSeineNavigationTreeNode.java | 28 + .../NonTargetCatchesSeineNavigationTreeNode.java | 28 + .../NoneTargetSamplesSeineNavigationTreeNode.java | 29 + .../seine/ProgramSeineNavigationTreeNode.java | 48 + .../nodes/seine/RouteSeineNavigationTreeNode.java | 44 + .../nodes/seine/RoutesSeineNavigationTreeNode.java | 62 ++ .../SchoolEstimatesSeineNavigationTreeNode.java | 28 + .../nodes/seine/SetSeineNavigationTreeNode.java | 41 + .../nodes/seine/TripSeineNavigationTreeNode.java | 48 + .../ui/tree/node/AbstrctReferenceNodeSupport.java | 116 --- .../swing/ui/tree/node/ActivityLonglineNode.java | 52 - .../swing/ui/tree/node/ActivitySeineNode.java | 52 - .../ui/tree/node/DataReferenceNodeSupport.java | 98 -- .../ui/tree/node/FloatingObjectSeineNode.java | 52 - .../swing/ui/tree/node/ObserveNode.java | 119 --- .../swing/ui/tree/node/ProgramLonglineNode.java | 71 -- .../swing/ui/tree/node/ProgramSeineNode.java | 69 -- .../tree/node/ReferentialReferenceNodeSupport.java | 85 -- .../swing/ui/tree/node/RouteSeineNode.java | 49 - .../swing/ui/tree/node/SetLonglineNode.java | 52 - .../swing/ui/tree/node/SetSeineNode.java | 52 - .../swing/ui/tree/node/TripLonglineNode.java | 50 - .../swing/ui/tree/node/TripSeineNode.java | 62 -- .../renderer/AbstractObserveTreeCellRenderer.java | 434 -------- .../renderer/DataSelectionTreeCellRenderer.java | 140 --- .../tree/renderer/NavigationTreeCellRenderer.java | 101 -- .../swing/ui/tree/selection/SelectionTree.java | 164 ++++ .../tree/selection/SelectionTreeCellRenderer.java | 39 + .../ui/tree/selection/SelectionTreeHeader.jaxx | 43 + .../selection/SelectionTreeHeader.jcss} | 42 +- .../tree/selection/SelectionTreeHeaderHandler.java | 96 ++ .../ui/tree/selection/SelectionTreeModel.java | 401 ++++++++ .../selection/nodes/ProgramSelectionTreeNode.java | 86 ++ .../nodes/ReferenceSelectionTreeNodeSupport.java | 52 + .../nodes/ReferentialSelectionTreeNode.java | 51 + .../nodes/ReferentialsSelectionTreeNode.java | 86 ++ .../selection/nodes/RootSelectionTreeNode.java | 61 ++ .../selection/nodes/SelectionTreeNodeSupport.java | 68 ++ .../nodes/TripLonglineSelectionTreeNode.java | 44 + .../nodes/TripSeineSelectionTreeNode.java | 45 + .../nodes/TripSelectionTreeNodeSupport.java | 27 + .../swing/ui/util/DecoratedNodeEntity.java | 6 +- .../ftl/dataSourceConnectionReport_en.ftl | 10 +- .../ftl/dataSourceConnectionReport_es.ftl | 10 +- .../ftl/dataSourceConnectionReport_fr.ftl | 10 +- .../i18n/application-swing_en_GB.properties | 3 + .../i18n/application-swing_es_ES.properties | 3 + .../i18n/application-swing_fr_FR.properties | 3 + .../v1/data/NavigationServiceController.java | 24 + application-web/src/main/resources/mapping | 1 + .../observe/ObserveTopiaApplicationContext.java | 25 +- .../fr/ird/observe/ObserveTopiaConfiguration.java | 12 +- .../observe/ObserveTopiaConfigurationFactory.java | 17 +- .../observe/ObserveTopiaPersistenceContext.java | 18 +- .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 11 +- .../fr/ird/observe/RunScriptsTopiaSqlWork.java | 6 +- .../entities/longline/TripLonglineImpl.java | 11 + .../entities/longline/TripLonglineTopiaDao.java | 7 +- .../observe/entities/referentiel/ProgramImpl.java | 16 +- .../entities/referentiel/ProgramTopiaDao.java | 121 --- .../ird/observe/entities/seine/TripSeineImpl.java | 4 +- entities/src/main/xmi/observe-common.zargo | Bin 45678 -> 45811 bytes entities/src/main/xmi/observe-longline.zargo | Bin 93824 -> 93999 bytes ...ObserveDataSourceConfigurationTopiaSupport.java | 11 + .../dto/reference/DataReferenceSetDefinitions.java | 1 + .../ReferentialReferenceSetDefinitions.java | 3 +- .../services/dto/longline/TripLonglineHelper.java | 14 + .../services/dto/referential/ProgramHelper.java | 6 +- .../seine/VesselActivitySeineHelper.java | 26 +- .../services/dto/seine/ActivitySeineDto.java | 25 +- .../services/dto/seine/TripSeineHelper.java | 13 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 48945 -> 49022 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67946 -> 68017 bytes .../topia/binder/BinderEngineInitializer.java | 230 ++--- .../{ => longline}/ActivityLonglineBinder.java | 3 +- .../ActivityLonglineEncouterDtoBinder.java | 3 +- .../ActivityLonglineSensorUsedDtoBinder.java | 3 +- .../ActivityLonglineStubDtoBinder.java | 3 +- .../{ => longline}/BaitsCompositionBinder.java | 3 +- .../binder/data/{ => longline}/BasketBinder.java | 3 +- .../data/{ => longline}/BranchlineBinder.java | 3 +- .../BranchlinesCompositionBinder.java | 3 +- .../data/{ => longline}/CatchLonglineBinder.java | 3 +- .../data/{ => longline}/EncounterBinder.java | 3 +- .../FloatlinesCompositionBinder.java | 3 +- .../GearUseFeaturesLonglineBinder.java | 3 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 3 +- .../{ => longline}/HooksCompositionBinder.java | 3 +- .../binder/data/{ => longline}/SectionBinder.java | 3 +- .../data/{ => longline}/SensorUsedBinder.java | 3 +- .../data/{ => longline}/SetLonglineBinder.java | 3 +- .../{ => longline}/SetLonglineCatchDtoBinder.java | 3 +- .../SetLonglineDetailCompositionDtoBinder.java | 3 +- .../SetLonglineGlobalCompositionDtoBinder.java | 3 +- .../{ => longline}/SetLonglineStubDtoBinder.java | 3 +- .../{ => longline}/SetLonglineTdrDtoBinder.java | 3 +- .../data/{ => longline}/SizeMeasureBinder.java | 3 +- .../binder/data/{ => longline}/TdrBinder.java | 3 +- .../TripLonglineActivityDtoBinder.java | 3 +- .../data/{ => longline}/TripLonglineBinder.java | 7 +- .../TripLonglineGearUseDtoBinder.java | 3 +- .../data/{ => longline}/WeightMeasureBinder.java | 3 +- .../data/{ => seine}/ActivitySeineBinder.java | 3 +- .../{ => seine}/ActivitySeineStubDtoBinder.java | 3 +- .../data/{ => seine}/FloatingObjectBinder.java | 3 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 3 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 3 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 3 +- .../GearUseFeaturesMeasurementSeineBinder.java | 3 +- .../{ => seine}/GearUseFeaturesSeineBinder.java | 3 +- .../data/{ => seine}/NonTargetCatchBinder.java | 3 +- .../data/{ => seine}/NonTargetLengthBinder.java | 3 +- .../data/{ => seine}/NonTargetSampleBinder.java | 3 +- .../{ => seine}/ObjectObservedSpeciesBinder.java | 3 +- .../{ => seine}/ObjectSchoolEstimateBinder.java | 3 +- .../topia/binder/data/{ => seine}/RouteBinder.java | 3 +- .../data/{ => seine}/RouteStubDtoBinder.java | 3 +- .../data/{ => seine}/SchoolEstimateBinder.java | 3 +- .../binder/data/{ => seine}/SetSeineBinder.java | 3 +- .../SetSeineNonTargetCatchDtoBinder.java | 3 +- .../SetSeineSchoolEstimateDtoBinder.java | 3 +- .../{ => seine}/SetSeineTargetCatchDtoBinder.java | 3 +- .../binder/data/{ => seine}/TargetCatchBinder.java | 3 +- .../data/{ => seine}/TargetLengthBinder.java | 3 +- .../data/{ => seine}/TargetSampleBinder.java | 3 +- .../data/{ => seine}/TransmittingBuoyBinder.java | 3 +- .../binder/data/{ => seine}/TripSeineBinder.java | 3 +- .../{ => seine}/TripSeineGearUseDtoBinder.java | 3 +- .../referential/{ => common}/CountryBinder.java | 3 +- .../referential/{ => common}/FpaZoneBinder.java | 3 +- .../referential/{ => common}/GearBinder.java | 3 +- .../{ => common}/GearCaracteristicBinder.java | 3 +- .../{ => common}/GearCaracteristicTypeBinder.java | 3 +- .../referential/{ => common}/HarbourBinder.java | 3 +- .../{ => common}/LengthLengthParameterBinder.java | 3 +- .../{ => common}/LengthWeightParameterBinder.java | 3 +- .../referential/{ => common}/OceanBinder.java | 3 +- .../referential/{ => common}/OrganismBinder.java | 3 +- .../referential/{ => common}/PersonBinder.java | 3 +- .../referential/{ => common}/ProgramBinder.java | 12 +- .../binder/referential/{ => common}/SexBinder.java | 3 +- .../referential/{ => common}/ShipOwnerBinder.java | 3 +- .../{ => common}/SizeMeasureTypeBinder.java | 3 +- .../referential/{ => common}/SpeciesBinder.java | 3 +- .../{ => common}/SpeciesGroupBinder.java | 3 +- .../{ => common}/SpeciesListBinder.java | 3 +- .../referential/{ => common}/VesselBinder.java | 3 +- .../{ => common}/VesselSizeCategoryBinder.java | 3 +- .../referential/{ => common}/VesselTypeBinder.java | 3 +- .../{ => common}/WeightMeasureTypeBinder.java | 3 +- .../{ => longline}/BaitHaulingStatusBinder.java | 3 +- .../{ => longline}/BaitSettingStatusBinder.java | 3 +- .../referential/{ => longline}/BaitTypeBinder.java | 3 +- .../{ => longline}/CatchFateLonglineBinder.java | 3 +- .../{ => longline}/EncounterTypeBinder.java | 3 +- .../{ => longline}/HealthnessBinder.java | 3 +- .../{ => longline}/HookPositionBinder.java | 3 +- .../referential/{ => longline}/HookSizeBinder.java | 3 +- .../referential/{ => longline}/HookTypeBinder.java | 3 +- .../ItemHorizontalPositionBinder.java | 3 +- .../{ => longline}/ItemVerticalPositionBinder.java | 3 +- .../{ => longline}/LightsticksColorBinder.java | 3 +- .../{ => longline}/LightsticksTypeBinder.java | 3 +- .../referential/{ => longline}/LineTypeBinder.java | 3 +- .../{ => longline}/MaturityStatusBinder.java | 3 +- .../{ => longline}/MitigationTypeBinder.java | 3 +- .../{ => longline}/SensorBrandBinder.java | 3 +- .../{ => longline}/SensorDataFormatBinder.java | 3 +- .../{ => longline}/SensorTypeBinder.java | 3 +- .../{ => longline}/SettingShapeBinder.java | 3 +- .../{ => longline}/StomacFullnessBinder.java | 3 +- .../referential/{ => longline}/TripTypeBinder.java | 3 +- .../VesselActivityLonglineBinder.java | 3 +- .../{ => seine}/DetectionModeBinder.java | 3 +- .../referential/{ => seine}/ObjectFateBinder.java | 3 +- .../{ => seine}/ObjectOperationBinder.java | 3 +- .../referential/{ => seine}/ObjectTypeBinder.java | 3 +- .../{ => seine}/ObservedSystemBinder.java | 3 +- .../{ => seine}/ReasonForDiscardBinder.java | 3 +- .../{ => seine}/ReasonForNoFishingBinder.java | 3 +- .../{ => seine}/ReasonForNullSetBinder.java | 3 +- .../referential/{ => seine}/SpeciesFateBinder.java | 3 +- .../{ => seine}/SpeciesStatusBinder.java | 3 +- .../{ => seine}/SurroundingActivityBinder.java | 3 +- .../TransmittingBuoyOperationBinder.java | 3 +- .../{ => seine}/TransmittingBuoyTypeBinder.java | 3 +- .../{ => seine}/VesselActivitySeineBinder.java | 3 +- .../{ => seine}/WeightCategoryBinder.java | 3 +- .../binder/referential/{ => seine}/WindBinder.java | 3 +- .../services/topia/ObserveServiceContextTopia.java | 46 +- .../services/topia/ObserveServiceFactoryTopia.java | 3 - .../ObserveTopiaApplicationContextFactory.java | 15 +- .../topia/service/DataSourceServiceTopia.java | 2 + .../service/data/ImportTripScriptTopiaSqlWork.java | 14 +- .../topia/service/data/NavigationServiceTopia.java | 79 ++ .../service/data/TripManagementServiceTopia.java | 9 +- .../service/data/seine/TripSeineServiceTopia.java | 1 - .../service/sql/SqlScriptProducerServiceTopia.java | 9 +- .../observe/services/ObserveServicesProvider.java | 3 + .../services/service/data/NavigationRequest.java | 30 + .../services/service/data/NavigationResult.java | 40 + .../services/service/data/NavigationService.java | 15 + .../topia/service/sql/batch/SqlRequests.java | 108 +- .../sql/batch/TopiaSqlBatchServiceImpl.java | 8 +- .../sql/batch/actions/AbstractSchemaAction.java | 4 +- .../sql/batch/actions/AbstractSqlAction.java | 15 +- .../sql/batch/actions/AbstractSqlRequest.java | 7 - .../sql/batch/actions/AbstractTablesAction.java | 47 +- .../sql/batch/actions/CreateSchemaAction.java | 14 +- .../sql/batch/actions/DeleteTablesAction.java | 10 +- .../sql/batch/actions/DropSchemaAction.java | 15 +- .../sql/batch/actions/ReplicateTablesAction.java | 6 +- .../sql/batch/actions/UpdateTablesAction.java | 10 +- .../sql/batch/tables/TopiaSqlTablesFactory.java | 12 +- 620 files changed, 10368 insertions(+), 14384 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.