branch develop updated (76ed733 -> a9d3f6d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 76ed733 Numerious code cleaning new a9d3f6d reformat code The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a9d3f6da2c6bf4afe1a9c7fda31bf604e6f22fb6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 23 10:01:42 2016 +0100 reformat code Summary of changes: .../swing/ObserveSwingApplicationContext.java | 4 +-- .../swing/db/ObserveSwingDataSource.java | 10 ++++---- .../ird/observe/application/swing/ui/UIHelper.java | 1 - .../swing/ui/actions/AbstractObserveAction.java | 6 ++--- .../actions/content/AbstractContentUIAction.java | 2 +- .../ui/actions/content/DeleteDataUIAction.java | 1 - .../actions/content/DeleteReferenceUIAction.java | 1 - .../actions/content/DeleteTableEntryUIAction.java | 1 - .../content/MoveActivityLonglinesUIAction.java | 2 +- .../actions/content/MoveTripLonglinesUIAction.java | 2 +- .../ui/actions/content/MoveTripSeinesUIAction.java | 4 +-- .../ui/actions/content/MoveTripsUIAction.java | 2 +- .../ui/actions/content/NewTableEntryUIAction.java | 1 - .../actions/content/ResetTableEntryUIAction.java | 1 - .../swing/ui/actions/content/SaveEditUIAction.java | 1 - .../ui/actions/content/SaveTableEntryUIAction.java | 1 - .../actions/global/NewNextDataGlobalUIAction.java | 1 - .../ui/actions/global/ResetDataGlobalUIAction.java | 1 - .../menu/action/LaunchConsolidateAction.java | 2 +- .../menu/action/LaunchDataSynchronizeAction.java | 2 +- .../menu/action/LaunchExportDataAction.java | 2 +- .../ui/actions/menu/action/LaunchReportAction.java | 2 +- .../menu/action/LaunchSynchronizeAction.java | 2 +- .../actions/menu/action/LaunchValidateAction.java | 2 +- .../ChangeApplicationLanguageToSpanishAction.java | 2 +- .../SaveCurrentRemoteConfigurationUIAction.java | 2 +- .../SaveCurrentServerConfigurationUIAction.java | 2 +- .../storage/UseRemoteConfigurationUIAction.java | 4 +-- .../storage/UseServerConfigurationUIAction.java | 2 +- .../application/swing/ui/admin/AdminStep.java | 8 +++--- .../swing/ui/admin/AdminTabUIHandler.java | 2 +- .../swing/ui/admin/config/SelectDataModel.java | 4 +-- .../ui/admin/consolidate/ConsolidateModel.java | 1 + .../swing/ui/admin/export/ExportUIHandler.java | 4 +-- .../swing/ui/admin/export/TripEntry.java | 2 +- .../swing/ui/admin/report/ReportConfigUI.jaxx | 2 +- .../swing/ui/admin/report/ReportUIHandler.java | 6 ++--- .../swing/ui/admin/report/ResultTableModel.java | 4 +-- .../admin/synchronize/data/DataSynchroModel.java | 1 + .../data/task/CopyToLeftDataSynchronizeTask.java | 4 +-- .../data/task/CopyToRightDataSynchronizeTask.java | 2 +- .../data/task/DataSynchronizeTaskSupport.java | 2 +- .../task/DeleteFromLeftDataSynchronizeTask.java | 2 +- .../task/DeleteFromRightDataSynchronizeTask.java | 2 +- .../legacy/ObsoleteReferentialReference.java | 4 +-- .../referential/legacy/SynchronizeModel.java | 4 +-- .../referential/legacy/SynchronizeUIHandler.java | 2 +- .../ng/ReferentialReplaceUIHandler.java | 2 +- .../referential/ng/ReferentialSynchroModel.java | 2 +- .../ng/ReferentialSynchronizeResources.java | 2 +- .../ng/ReferentialSynchronizeTaskListModel.java | 2 +- .../ng/action/RegisterAddTaskAction.java | 4 +-- .../ng/action/RegisterCopyTaskAction.java | 4 +-- .../ng/action/RegisterDeleteTaskAction.java | 4 +-- .../ng/action/RegisterDesactivateTaskAction.java | 2 +- .../ng/action/RegisterRevertTaskAction.java | 4 +-- .../ng/action/RegisterSkipTaskAction.java | 4 +-- .../ng/action/RegisterTasksActionSupport.java | 2 +- .../ng/action/RegisterUpdateTaskAction.java | 4 +-- .../ng/task/AddReferentialSynchronizeTask.java | 4 +-- .../ng/task/DeleteReferentialSynchronizeTask.java | 4 +-- .../DesactivateReferentialSynchronizeTask.java | 4 +-- .../ng/task/ReferentialSynchronizeTaskSupport.java | 4 +-- ...ferentialSynchronizeTaskWithReplaceSupport.java | 4 +-- .../ng/task/RevertReferentialSynchronizeTask.java | 4 +-- .../ng/task/SkipReferentialSynchronizeTask.java | 4 +-- .../ng/task/UpdateReferentialSynchronizeTask.java | 4 +-- .../ng/tree/ReferentialSynchronizeTreeModel.java | 2 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 2 +- .../node/AddedReferenceReferentialSynchroNode.java | 2 +- .../ReferenceReferentialSynchroNodeSupport.java | 4 +-- .../UpdatedReferenceReferentialSynchroNode.java | 2 +- .../swing/ui/admin/validate/ValidateConfigUI.jaxx | 4 +-- .../swing/ui/admin/validate/ValidateModel.java | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 2 +- .../swing/ui/content/ContentUIHandler.java | 8 +++--- .../swing/ui/content/ContentUIInitializer.java | 6 ++--- .../swing/ui/content/ContentUIModel.java | 6 ++--- .../impl/longline/SetLonglineUIHandler.java | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +-- .../ui/content/list/ContentListUIHandler.java | 4 +-- .../swing/ui/content/list/ContentListUIModel.java | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +-- .../list/impl/longline/TripLonglinesUIModel.java | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +-- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +-- .../ui/content/ref/ContentReferenceUIHandler.java | 6 ++--- .../swing/ui/content/ref/ReferenceHomeSeineUI.java | 2 +- .../swing/ui/content/ref/impl/GearUIHandler.java | 2 +- .../ref/impl/LengthLengthParameterUIHandler.java | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 2 +- .../content/ref/usage/UsageUIHandlerSupport.java | 6 ++--- .../impl/GearUseFeatureMeasurementCellEditor.java | 2 +- .../GearUseFeatureMeasurementCellRenderer.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +-- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../GearUseFeaturesLonglineTableModel.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 3 +-- ...rUseFeaturesMeasurementLonglinesTableModel.java | 2 +- .../impl/longline/LonglinePositionHelper.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 3 +-- .../table/impl/seine/NonTargetCatchUIHandler.java | 4 +-- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../ird/observe/application/swing/ui/package.html | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 2 +- .../swing/ui/storage/StorageBackupUILauncher.java | 4 +-- .../swing/ui/storage/StorageUIHandler.java | 2 +- .../swing/ui/storage/StorageUIModel.java | 2 +- .../swing/ui/storage/tabs/ConfigUI.jaxx | 2 +- .../swing/ui/storage/tabs/ConfigUIHandler.java | 4 +-- .../tree/ObserveNavigationTreeShowPopupAction.java | 2 +- .../menu/MoveTripLonglineNodeMenuPopulator.java | 2 +- .../tree/menu/MoveTripSeineNodeMenuPopulator.java | 2 +- .../swing/ui/tree/navigation/NavigationTree.java | 6 ++--- .../navigation/NavigationTreeHeaderHandler.java | 2 +- .../ui/tree/navigation/NavigationTreeModel.java | 4 +-- .../nodes/NavigationTreeNodeSupport.java | 2 +- .../nodes/ReferenceNavigationTreeNodeSupport.java | 2 +- .../navigation/nodes/RootNavigationTreeNode.java | 2 +- .../ActivitiesLonglineNavigationTreeNode.java | 2 +- .../ActivityLonglineNavigationTreeNode.java | 2 +- .../ProgramLonglineNavigationTreeNode.java | 4 +-- .../longline/SetLonglineNavigationTreeNode.java | 2 +- .../longline/TripLonglineNavigationTreeNode.java | 2 +- .../seine/ProgramSeineNavigationTreeNode.java | 2 +- .../ui/tree/selection/SelectionTreeModel.java | 4 +-- .../selection/nodes/ProgramSelectionTreeNode.java | 4 +-- .../nodes/ReferenceSelectionTreeNodeSupport.java | 2 +- .../nodes/TripLonglineSelectionTreeNode.java | 2 +- .../swing/ui/util/JVetoableTabbedPane.java | 2 +- .../ui/util/table/EditableTableModelSupport.java | 10 ++++---- .../util/table/MoveToNextEditableCellAction.java | 4 +-- .../ui/util/table/MoveToNextEditableRowAction.java | 2 +- .../table/MoveToPreviousEditableCellAction.java | 2 +- .../table/MoveToPreviousEditableRowAction.java | 2 +- .../table/ObserveBooleanTableCellRenderer.java | 2 +- .../swing/ui/util/tripMap/ObserveMapPane.java | 19 +++++++------- .../swing/validation/ValidationContext.java | 2 +- .../web/ObserveWebApplicationContext.java | 4 +-- .../ObserveWebApplicationContextInitException.java | 2 +- .../application/web/ObserveWebMotionFilter.java | 2 +- .../controller/v1/DataSourceServiceController.java | 8 +++--- .../controller/v1/ObserveWebErrorController.java | 2 +- ...eferentialSynchronizeDiffServiceController.java | 2 +- ...ferentialSynchronizeLocalServiceController.java | 4 +-- .../ActivityLonglineServiceController.java | 4 +-- .../longline/SetLonglineServiceController.java | 2 +- .../longline/TripLonglineServiceController.java | 6 ++--- .../data/seine/ActivitySeineServiceController.java | 2 +- .../seine/FloatingObjectServiceController.java | 2 +- .../v1/data/seine/RouteServiceController.java | 2 +- .../v1/data/seine/SetSeineServiceController.java | 2 +- .../v1/data/seine/TripSeineServiceController.java | 4 +-- .../referential/ReferentialServiceController.java | 4 +-- .../v1/sql/SqlScriptProducerServiceController.java | 2 +- .../web/converter/ObserveDtoConverter.java | 2 +- .../application/web/injector/DateInjector.java | 2 +- .../web/injector/ImmutableSetInjector.java | 2 +- .../web/injector/ObserveDtoInjector.java | 6 ++--- .../web/request/ObserveWebRequestContext.java | 2 +- .../ObserveWebSecurityApplicationContext.java | 4 +-- ...ObserveWebSecurityAuthenticationTokenCache.java | 18 ++++++------- .../entities/longline/ActivityLonglineImpl.java | 2 +- .../observe/entities/longline/BasketTopiaDao.java | 4 +-- .../entities/longline/BranchlineTopiaDao.java | 12 ++++----- .../observe/entities/longline/SectionTopiaDao.java | 2 +- .../observe/entities/longline/SetLonglineImpl.java | 28 ++++++++++---------- .../observe/entities/longline/TripLonglines.java | 2 +- .../referentiel/LengthLengthParameters.java | 4 +-- .../referentiel/LengthWeightParameters.java | 2 +- .../observe/entities/seine/ActivitySeineImpl.java | 2 +- .../entities/seine/FloatingObjectTopiaDao.java | 14 +++++----- .../observe/entities/seine/NonTargetCatches.java | 6 ++--- .../ObserveTopiaApplicationContext.java | 2 +- .../observe/persistence/ObserveTopiaIdFactory.java | 4 +-- .../migration/H2DataSourceMigration.java | 8 +++--- .../migration/PGDataSourceMigration.java | 16 ++++++------ .../old/DataSourceMigrationForVersion_4_0_1.java | 4 +-- .../observe/services/ObserveDataReferenceSets.java | 2 +- .../observe/services/ObserveServicesProvider.java | 8 +++--- .../services/binder/ReferenceBinderEngine.java | 4 +-- .../java/fr/ird/observe/services/dto/IdDto.java | 6 ++--- .../fr/ird/observe/services/dto/form/Form.java | 8 +++--- .../services/dto/form/FormRequestDefinition.java | 4 +-- .../dto/form/FormRequestKeyDefinition.java | 6 ++--- .../services/dto/longline/SectionTemplate.java | 2 +- .../services/dto/reference/AbstractReference.java | 2 +- .../services/dto/reference/DataReference.java | 8 +++--- .../services/dto/reference/DataReferenceSet.java | 4 +-- .../services/dto/reference/ReferenceMap.java | 1 - .../dto/reference/ReferenceSetDefinition.java | 2 +- .../services/dto/referential/PersonHelper.java | 6 ++--- .../services/dto/referential/ProgramDto.java | 3 ++- .../referential/seine/WeightCategoryHelper.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 10 ++++---- ...urceCreateWithNoReferentialImportException.java | 2 -- ...ibleDataSourceCreateConfigurationException.java | 2 -- .../fr/ird/observe/services/gson/FormAdapter.java | 2 +- .../services/gson/ImmutableListAdapter.java | 3 ++- .../services/gson/ObserveDtoGsonSupplier.java | 30 +++++++++++++--------- .../services/gson/ReferentialMultimapAdapter.java | 6 +++-- .../services/gson/ReportVariableAdapter.java | 4 +-- .../gson/reference/AbstractReferenceAdapter.java | 2 +- .../gson/reference/DataReferenceAdapter.java | 2 +- .../ReferenceCollectionSupportAdapter.java | 2 +- .../reference/ReferentialReferenceAdapter.java | 4 +-- .../reference/ReferentialReferenceSetAdapter.java | 2 +- .../gson/reference/UnknownReferenceAdapter.java | 6 ++--- .../security/AdminApiKeyNotFoundException.java | 2 +- .../AuthenticationTokenNotFoundException.java | 2 +- .../SecurityRequestContextNotFoundException.java | 2 +- .../security/UserLoginNotFoundException.java | 2 +- .../security/UserPasswordNotFoundException.java | 2 +- .../services/service/DataSourceService.java | 4 +-- .../DatabaseConnexionNotAuthorizedException.java | 1 + .../DatabaseDestroyNotAuthorizedException.java | 1 + .../service/DatabaseNotFoundException.java | 2 +- .../ConsolidateActivitySeineDataResult.java | 4 +-- .../ConsolidateTripSeineDataResult.java | 2 +- .../service/actions/report/DataMatrix.java | 8 +++--- .../services/service/actions/report/Report.java | 1 - .../diff/ReferentialSynchronizeDiffService.java | 2 +- .../diff/ReferentialSynchronizeDiffsEngine.java | 2 +- ...ionalReferentialSynchronizeCallbackRequest.java | 6 ++--- ...onalReferentialSynchronizeCallbackRequests.java | 2 +- ...tionalReferentialSynchronizeCallbackResult.java | 1 - ...UnidirectionalReferentialSynchronizeEngine.java | 4 +-- ...ectionalReferentialSynchronizeLocalService.java | 2 +- .../actions/validate/ValidateResultForDto.java | 2 +- .../actions/validate/ValidateResultForDtoType.java | 2 +- .../actions/validate/ValidationMessage.java | 8 +++--- .../validate/ValidatorInitializationException.java | 2 +- .../services/service/data/ExportTripResult.java | 2 +- .../services/service/data/ImportTripRequest.java | 2 +- .../services/service/data/NavigationResult.java | 4 +-- .../data/longline/ActivityLonglineService.java | 4 +-- .../service/data/longline/SetLonglineService.java | 2 +- .../service/data/longline/TripLonglineService.java | 6 ++--- .../service/data/seine/ActivitySeineService.java | 2 +- .../service/data/seine/FloatingObjectService.java | 2 +- .../services/service/data/seine/RouteService.java | 2 +- .../service/data/seine/SetSeineService.java | 2 +- .../service/data/seine/TripSeineService.java | 6 ++--- .../referential/ObserveReferentialCache.java | 6 ++--- .../service/referential/ReferentialService.java | 4 +-- .../service/sql/AddSqlScriptProducerResult.java | 1 + .../sql/DeleteSqlScriptProducerRequest.java | 6 ++--- 264 files changed, 454 insertions(+), 461 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 a9d3f6da2c6bf4afe1a9c7fda31bf604e6f22fb6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 23 10:01:42 2016 +0100 reformat code --- .../swing/ObserveSwingApplicationContext.java | 4 +-- .../swing/db/ObserveSwingDataSource.java | 10 ++++---- .../ird/observe/application/swing/ui/UIHelper.java | 1 - .../swing/ui/actions/AbstractObserveAction.java | 6 ++--- .../actions/content/AbstractContentUIAction.java | 2 +- .../ui/actions/content/DeleteDataUIAction.java | 1 - .../actions/content/DeleteReferenceUIAction.java | 1 - .../actions/content/DeleteTableEntryUIAction.java | 1 - .../content/MoveActivityLonglinesUIAction.java | 2 +- .../actions/content/MoveTripLonglinesUIAction.java | 2 +- .../ui/actions/content/MoveTripSeinesUIAction.java | 4 +-- .../ui/actions/content/MoveTripsUIAction.java | 2 +- .../ui/actions/content/NewTableEntryUIAction.java | 1 - .../actions/content/ResetTableEntryUIAction.java | 1 - .../swing/ui/actions/content/SaveEditUIAction.java | 1 - .../ui/actions/content/SaveTableEntryUIAction.java | 1 - .../actions/global/NewNextDataGlobalUIAction.java | 1 - .../ui/actions/global/ResetDataGlobalUIAction.java | 1 - .../menu/action/LaunchConsolidateAction.java | 2 +- .../menu/action/LaunchDataSynchronizeAction.java | 2 +- .../menu/action/LaunchExportDataAction.java | 2 +- .../ui/actions/menu/action/LaunchReportAction.java | 2 +- .../menu/action/LaunchSynchronizeAction.java | 2 +- .../actions/menu/action/LaunchValidateAction.java | 2 +- .../ChangeApplicationLanguageToSpanishAction.java | 2 +- .../SaveCurrentRemoteConfigurationUIAction.java | 2 +- .../SaveCurrentServerConfigurationUIAction.java | 2 +- .../storage/UseRemoteConfigurationUIAction.java | 4 +-- .../storage/UseServerConfigurationUIAction.java | 2 +- .../application/swing/ui/admin/AdminStep.java | 8 +++--- .../swing/ui/admin/AdminTabUIHandler.java | 2 +- .../swing/ui/admin/config/SelectDataModel.java | 4 +-- .../ui/admin/consolidate/ConsolidateModel.java | 1 + .../swing/ui/admin/export/ExportUIHandler.java | 4 +-- .../swing/ui/admin/export/TripEntry.java | 2 +- .../swing/ui/admin/report/ReportConfigUI.jaxx | 2 +- .../swing/ui/admin/report/ReportUIHandler.java | 6 ++--- .../swing/ui/admin/report/ResultTableModel.java | 4 +-- .../admin/synchronize/data/DataSynchroModel.java | 1 + .../data/task/CopyToLeftDataSynchronizeTask.java | 4 +-- .../data/task/CopyToRightDataSynchronizeTask.java | 2 +- .../data/task/DataSynchronizeTaskSupport.java | 2 +- .../task/DeleteFromLeftDataSynchronizeTask.java | 2 +- .../task/DeleteFromRightDataSynchronizeTask.java | 2 +- .../legacy/ObsoleteReferentialReference.java | 4 +-- .../referential/legacy/SynchronizeModel.java | 4 +-- .../referential/legacy/SynchronizeUIHandler.java | 2 +- .../ng/ReferentialReplaceUIHandler.java | 2 +- .../referential/ng/ReferentialSynchroModel.java | 2 +- .../ng/ReferentialSynchronizeResources.java | 2 +- .../ng/ReferentialSynchronizeTaskListModel.java | 2 +- .../ng/action/RegisterAddTaskAction.java | 4 +-- .../ng/action/RegisterCopyTaskAction.java | 4 +-- .../ng/action/RegisterDeleteTaskAction.java | 4 +-- .../ng/action/RegisterDesactivateTaskAction.java | 2 +- .../ng/action/RegisterRevertTaskAction.java | 4 +-- .../ng/action/RegisterSkipTaskAction.java | 4 +-- .../ng/action/RegisterTasksActionSupport.java | 2 +- .../ng/action/RegisterUpdateTaskAction.java | 4 +-- .../ng/task/AddReferentialSynchronizeTask.java | 4 +-- .../ng/task/DeleteReferentialSynchronizeTask.java | 4 +-- .../DesactivateReferentialSynchronizeTask.java | 4 +-- .../ng/task/ReferentialSynchronizeTaskSupport.java | 4 +-- ...ferentialSynchronizeTaskWithReplaceSupport.java | 4 +-- .../ng/task/RevertReferentialSynchronizeTask.java | 4 +-- .../ng/task/SkipReferentialSynchronizeTask.java | 4 +-- .../ng/task/UpdateReferentialSynchronizeTask.java | 4 +-- .../ng/tree/ReferentialSynchronizeTreeModel.java | 2 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 2 +- .../node/AddedReferenceReferentialSynchroNode.java | 2 +- .../ReferenceReferentialSynchroNodeSupport.java | 4 +-- .../UpdatedReferenceReferentialSynchroNode.java | 2 +- .../swing/ui/admin/validate/ValidateConfigUI.jaxx | 4 +-- .../swing/ui/admin/validate/ValidateModel.java | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 2 +- .../swing/ui/content/ContentUIHandler.java | 8 +++--- .../swing/ui/content/ContentUIInitializer.java | 6 ++--- .../swing/ui/content/ContentUIModel.java | 6 ++--- .../impl/longline/SetLonglineUIHandler.java | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +-- .../ui/content/list/ContentListUIHandler.java | 4 +-- .../swing/ui/content/list/ContentListUIModel.java | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +-- .../list/impl/longline/TripLonglinesUIModel.java | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +-- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +-- .../ui/content/ref/ContentReferenceUIHandler.java | 6 ++--- .../swing/ui/content/ref/ReferenceHomeSeineUI.java | 2 +- .../swing/ui/content/ref/impl/GearUIHandler.java | 2 +- .../ref/impl/LengthLengthParameterUIHandler.java | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 2 +- .../content/ref/usage/UsageUIHandlerSupport.java | 6 ++--- .../impl/GearUseFeatureMeasurementCellEditor.java | 2 +- .../GearUseFeatureMeasurementCellRenderer.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +-- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../GearUseFeaturesLonglineTableModel.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 3 +-- ...rUseFeaturesMeasurementLonglinesTableModel.java | 2 +- .../impl/longline/LonglinePositionHelper.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 3 +-- .../table/impl/seine/NonTargetCatchUIHandler.java | 4 +-- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../ird/observe/application/swing/ui/package.html | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 2 +- .../swing/ui/storage/StorageBackupUILauncher.java | 4 +-- .../swing/ui/storage/StorageUIHandler.java | 2 +- .../swing/ui/storage/StorageUIModel.java | 2 +- .../swing/ui/storage/tabs/ConfigUI.jaxx | 2 +- .../swing/ui/storage/tabs/ConfigUIHandler.java | 4 +-- .../tree/ObserveNavigationTreeShowPopupAction.java | 2 +- .../menu/MoveTripLonglineNodeMenuPopulator.java | 2 +- .../tree/menu/MoveTripSeineNodeMenuPopulator.java | 2 +- .../swing/ui/tree/navigation/NavigationTree.java | 6 ++--- .../navigation/NavigationTreeHeaderHandler.java | 2 +- .../ui/tree/navigation/NavigationTreeModel.java | 4 +-- .../nodes/NavigationTreeNodeSupport.java | 2 +- .../nodes/ReferenceNavigationTreeNodeSupport.java | 2 +- .../navigation/nodes/RootNavigationTreeNode.java | 2 +- .../ActivitiesLonglineNavigationTreeNode.java | 2 +- .../ActivityLonglineNavigationTreeNode.java | 2 +- .../ProgramLonglineNavigationTreeNode.java | 4 +-- .../longline/SetLonglineNavigationTreeNode.java | 2 +- .../longline/TripLonglineNavigationTreeNode.java | 2 +- .../seine/ProgramSeineNavigationTreeNode.java | 2 +- .../ui/tree/selection/SelectionTreeModel.java | 4 +-- .../selection/nodes/ProgramSelectionTreeNode.java | 4 +-- .../nodes/ReferenceSelectionTreeNodeSupport.java | 2 +- .../nodes/TripLonglineSelectionTreeNode.java | 2 +- .../swing/ui/util/JVetoableTabbedPane.java | 2 +- .../ui/util/table/EditableTableModelSupport.java | 10 ++++---- .../util/table/MoveToNextEditableCellAction.java | 4 +-- .../ui/util/table/MoveToNextEditableRowAction.java | 2 +- .../table/MoveToPreviousEditableCellAction.java | 2 +- .../table/MoveToPreviousEditableRowAction.java | 2 +- .../table/ObserveBooleanTableCellRenderer.java | 2 +- .../swing/ui/util/tripMap/ObserveMapPane.java | 19 +++++++------- .../swing/validation/ValidationContext.java | 2 +- .../web/ObserveWebApplicationContext.java | 4 +-- .../ObserveWebApplicationContextInitException.java | 2 +- .../application/web/ObserveWebMotionFilter.java | 2 +- .../controller/v1/DataSourceServiceController.java | 8 +++--- .../controller/v1/ObserveWebErrorController.java | 2 +- ...eferentialSynchronizeDiffServiceController.java | 2 +- ...ferentialSynchronizeLocalServiceController.java | 4 +-- .../ActivityLonglineServiceController.java | 4 +-- .../longline/SetLonglineServiceController.java | 2 +- .../longline/TripLonglineServiceController.java | 6 ++--- .../data/seine/ActivitySeineServiceController.java | 2 +- .../seine/FloatingObjectServiceController.java | 2 +- .../v1/data/seine/RouteServiceController.java | 2 +- .../v1/data/seine/SetSeineServiceController.java | 2 +- .../v1/data/seine/TripSeineServiceController.java | 4 +-- .../referential/ReferentialServiceController.java | 4 +-- .../v1/sql/SqlScriptProducerServiceController.java | 2 +- .../web/converter/ObserveDtoConverter.java | 2 +- .../application/web/injector/DateInjector.java | 2 +- .../web/injector/ImmutableSetInjector.java | 2 +- .../web/injector/ObserveDtoInjector.java | 6 ++--- .../web/request/ObserveWebRequestContext.java | 2 +- .../ObserveWebSecurityApplicationContext.java | 4 +-- ...ObserveWebSecurityAuthenticationTokenCache.java | 18 ++++++------- .../entities/longline/ActivityLonglineImpl.java | 2 +- .../observe/entities/longline/BasketTopiaDao.java | 4 +-- .../entities/longline/BranchlineTopiaDao.java | 12 ++++----- .../observe/entities/longline/SectionTopiaDao.java | 2 +- .../observe/entities/longline/SetLonglineImpl.java | 28 ++++++++++---------- .../observe/entities/longline/TripLonglines.java | 2 +- .../referentiel/LengthLengthParameters.java | 4 +-- .../referentiel/LengthWeightParameters.java | 2 +- .../observe/entities/seine/ActivitySeineImpl.java | 2 +- .../entities/seine/FloatingObjectTopiaDao.java | 14 +++++----- .../observe/entities/seine/NonTargetCatches.java | 6 ++--- .../ObserveTopiaApplicationContext.java | 2 +- .../observe/persistence/ObserveTopiaIdFactory.java | 4 +-- .../migration/H2DataSourceMigration.java | 8 +++--- .../migration/PGDataSourceMigration.java | 16 ++++++------ .../old/DataSourceMigrationForVersion_4_0_1.java | 4 +-- .../observe/services/ObserveDataReferenceSets.java | 2 +- .../observe/services/ObserveServicesProvider.java | 8 +++--- .../services/binder/ReferenceBinderEngine.java | 4 +-- .../java/fr/ird/observe/services/dto/IdDto.java | 6 ++--- .../fr/ird/observe/services/dto/form/Form.java | 8 +++--- .../services/dto/form/FormRequestDefinition.java | 4 +-- .../dto/form/FormRequestKeyDefinition.java | 6 ++--- .../services/dto/longline/SectionTemplate.java | 2 +- .../services/dto/reference/AbstractReference.java | 2 +- .../services/dto/reference/DataReference.java | 8 +++--- .../services/dto/reference/DataReferenceSet.java | 4 +-- .../services/dto/reference/ReferenceMap.java | 1 - .../dto/reference/ReferenceSetDefinition.java | 2 +- .../services/dto/referential/PersonHelper.java | 6 ++--- .../services/dto/referential/ProgramDto.java | 3 ++- .../referential/seine/WeightCategoryHelper.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 10 ++++---- ...urceCreateWithNoReferentialImportException.java | 2 -- ...ibleDataSourceCreateConfigurationException.java | 2 -- .../fr/ird/observe/services/gson/FormAdapter.java | 2 +- .../services/gson/ImmutableListAdapter.java | 3 ++- .../services/gson/ObserveDtoGsonSupplier.java | 30 +++++++++++++--------- .../services/gson/ReferentialMultimapAdapter.java | 6 +++-- .../services/gson/ReportVariableAdapter.java | 4 +-- .../gson/reference/AbstractReferenceAdapter.java | 2 +- .../gson/reference/DataReferenceAdapter.java | 2 +- .../ReferenceCollectionSupportAdapter.java | 2 +- .../reference/ReferentialReferenceAdapter.java | 4 +-- .../reference/ReferentialReferenceSetAdapter.java | 2 +- .../gson/reference/UnknownReferenceAdapter.java | 6 ++--- .../security/AdminApiKeyNotFoundException.java | 2 +- .../AuthenticationTokenNotFoundException.java | 2 +- .../SecurityRequestContextNotFoundException.java | 2 +- .../security/UserLoginNotFoundException.java | 2 +- .../security/UserPasswordNotFoundException.java | 2 +- .../services/service/DataSourceService.java | 4 +-- .../DatabaseConnexionNotAuthorizedException.java | 1 + .../DatabaseDestroyNotAuthorizedException.java | 1 + .../service/DatabaseNotFoundException.java | 2 +- .../ConsolidateActivitySeineDataResult.java | 4 +-- .../ConsolidateTripSeineDataResult.java | 2 +- .../service/actions/report/DataMatrix.java | 8 +++--- .../services/service/actions/report/Report.java | 1 - .../diff/ReferentialSynchronizeDiffService.java | 2 +- .../diff/ReferentialSynchronizeDiffsEngine.java | 2 +- ...ionalReferentialSynchronizeCallbackRequest.java | 6 ++--- ...onalReferentialSynchronizeCallbackRequests.java | 2 +- ...tionalReferentialSynchronizeCallbackResult.java | 1 - ...UnidirectionalReferentialSynchronizeEngine.java | 4 +-- ...ectionalReferentialSynchronizeLocalService.java | 2 +- .../actions/validate/ValidateResultForDto.java | 2 +- .../actions/validate/ValidateResultForDtoType.java | 2 +- .../actions/validate/ValidationMessage.java | 8 +++--- .../validate/ValidatorInitializationException.java | 2 +- .../services/service/data/ExportTripResult.java | 2 +- .../services/service/data/ImportTripRequest.java | 2 +- .../services/service/data/NavigationResult.java | 4 +-- .../data/longline/ActivityLonglineService.java | 4 +-- .../service/data/longline/SetLonglineService.java | 2 +- .../service/data/longline/TripLonglineService.java | 6 ++--- .../service/data/seine/ActivitySeineService.java | 2 +- .../service/data/seine/FloatingObjectService.java | 2 +- .../services/service/data/seine/RouteService.java | 2 +- .../service/data/seine/SetSeineService.java | 2 +- .../service/data/seine/TripSeineService.java | 6 ++--- .../referential/ObserveReferentialCache.java | 6 ++--- .../service/referential/ReferentialService.java | 4 +-- .../service/sql/AddSqlScriptProducerResult.java | 1 + .../sql/DeleteSqlScriptProducerRequest.java | 6 ++--- 264 files changed, 454 insertions(+), 461 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java index 9e5067e..f542666 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java @@ -28,14 +28,14 @@ import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationCon import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.content.ObserveActionMap; import fr.ird.observe.application.swing.ui.content.ContentUIManager; +import fr.ird.observe.application.swing.ui.content.ObserveActionMap; import fr.ird.observe.application.swing.ui.content.ObserveFocusManager; import fr.ird.observe.application.swing.validation.ValidationContext; import fr.ird.observe.services.ObserveServicesProvider; -import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.binder.ReferenceBinderEngine; import fr.ird.observe.services.binder.ReferenceBinderEngineSupplier; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.runner.ObserveServiceMainFactory; import fr.ird.observe.services.service.actions.validate.ValidateServiceUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java index ae922e3..ef203d9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java @@ -43,16 +43,16 @@ import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfiguration import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaSupport; -import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; -import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.runner.ObserveServiceMainFactory; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java index dee9a79..7197ac1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java @@ -66,7 +66,6 @@ import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java index 2192be6..0740b9a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java @@ -41,14 +41,14 @@ public abstract class AbstractObserveAction extends AbstractAction { public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { if (changeSupport != null) { - changeSupport.addPropertyChangeListener(propertyName,listener); + changeSupport.addPropertyChangeListener(propertyName, listener); } } - public synchronized void removePropertyChangeListener(String propertyName,PropertyChangeListener listener) { + public synchronized void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { if (changeSupport != null) { - changeSupport.removePropertyChangeListener(propertyName,listener); + changeSupport.removePropertyChangeListener(propertyName, listener); } } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java index b11daf2..7deff4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java @@ -50,7 +50,7 @@ public abstract class AbstractContentUIAction extends AbstractUIAction { if (!canExecuteAction()) { return; } - this.e=e; + this.e = e; ContentUI<?, ?> contentUI = getContentUI(e); actionPerformed(contentUI); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java index c68b797..0d1b2e8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java @@ -22,7 +22,6 @@ package fr.ird.observe.application.swing.ui.actions.content; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.content.AbstractContentUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import javax.swing.SwingUtilities; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java index 884c969..cc874b3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java @@ -22,7 +22,6 @@ package fr.ird.observe.application.swing.ui.actions.content; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.content.AbstractContentUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import static org.nuiton.i18n.I18n.n; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java index a9c025e..0de1a21 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.actions.content; */ import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.content.AbstractContentUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java index 64eeb64..8a3108e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java @@ -32,9 +32,9 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java index d1ddf17..e09e23d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java @@ -27,9 +27,9 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUI; import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUIModel; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.common.constants.GearType; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.util.ArrayList; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java index 24267f3..606003e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java @@ -27,8 +27,8 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUIModel; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.common.constants.GearType; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.seine.TripSeineService; @@ -50,7 +50,7 @@ public class MoveTripSeinesUIAction extends MoveTripsUIAction<TripSeineDto> { } @Override - protected void checkUIClass(ContentUI<?,?> ui) throws IllegalStateException { + protected void checkUIClass(ContentUI<?, ?> ui) throws IllegalStateException { if (!(ui instanceof TripSeinesUI)) { throw new IllegalStateException("Can not come here!"); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java index 5f9d854..2c55f3a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java @@ -32,9 +32,9 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.RootNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; +import fr.ird.observe.common.constants.GearType; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.common.constants.GearType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java index ce8073e..f058741 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.actions.content; */ import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.content.AbstractContentUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java index 06cb167..44de9ab 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.actions.content; */ import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.content.AbstractContentUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java index 1fac9b0..fb1ffff 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java @@ -22,7 +22,6 @@ package fr.ird.observe.application.swing.ui.actions.content; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.content.AbstractContentUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import static org.nuiton.i18n.I18n.n; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java index 90599be..64e94eb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.actions.content; */ import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.content.AbstractContentUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java index e5dca9d..cc7b4ce 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java @@ -24,7 +24,6 @@ package fr.ird.observe.application.swing.ui.actions.global; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ResetDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ResetDataGlobalUIAction.java index 76a0e0d..cc567dd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ResetDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ResetDataGlobalUIAction.java @@ -24,7 +24,6 @@ package fr.ird.observe.application.swing.ui.actions.global; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import javax.swing.JButton; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java index 51c4a5f..73c8594 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; */ public class LaunchConsolidateAction extends LaunchAdminActionSupport { - public static final String ACTION_NAME=LaunchConsolidateAction.class.getSimpleName(); + public static final String ACTION_NAME = LaunchConsolidateAction.class.getSimpleName(); public LaunchConsolidateAction(ObserveMainUI ui) { super(ui, ACTION_NAME, AdminStep.CONSOLIDATE); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java index a6ac45f..d256763 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; */ public class LaunchDataSynchronizeAction extends LaunchAdminActionSupport { - public static final String ACTION_NAME=LaunchDataSynchronizeAction.class.getSimpleName(); + public static final String ACTION_NAME = LaunchDataSynchronizeAction.class.getSimpleName(); public LaunchDataSynchronizeAction(ObserveMainUI ui) { super(ui, ACTION_NAME, AdminStep.DATA_SYNCHRONIZE); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java index 52bd4da..a7f9085 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; */ public class LaunchExportDataAction extends LaunchAdminActionSupport { - public static final String ACTION_NAME=LaunchExportDataAction.class.getSimpleName(); + public static final String ACTION_NAME = LaunchExportDataAction.class.getSimpleName(); public LaunchExportDataAction(ObserveMainUI ui) { super(ui, ACTION_NAME, AdminStep.EXPORT_DATA); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java index 8237aee..9a15aa7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; */ public class LaunchReportAction extends LaunchAdminActionSupport { - public static final String ACTION_NAME=LaunchReportAction.class.getSimpleName(); + public static final String ACTION_NAME = LaunchReportAction.class.getSimpleName(); public LaunchReportAction(ObserveMainUI ui) { super(ui, ACTION_NAME, AdminStep.REPORT); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java index dc2d18b..008dbb6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; */ public class LaunchSynchronizeAction extends LaunchAdminActionSupport { - public static final String ACTION_NAME=LaunchSynchronizeAction.class.getSimpleName(); + public static final String ACTION_NAME = LaunchSynchronizeAction.class.getSimpleName(); public LaunchSynchronizeAction(ObserveMainUI ui) { super(ui, ACTION_NAME, AdminStep.SYNCHRONIZE); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java index 4ae8f86..00d2064 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; */ public class LaunchValidateAction extends LaunchAdminActionSupport { - public static final String ACTION_NAME=LaunchValidateAction.class.getSimpleName(); + public static final String ACTION_NAME = LaunchValidateAction.class.getSimpleName(); public LaunchValidateAction(ObserveMainUI ui) { super(ui, ACTION_NAME, AdminStep.VALIDATE); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java index 5930960..3adea75 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java @@ -39,7 +39,7 @@ public class ChangeApplicationLanguageToSpanishAction extends ChangeApplicationL public static final String ACTION_NAME = ChangeApplicationLanguageToSpanishAction.class.getSimpleName(); public ChangeApplicationLanguageToSpanishAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, new Locale("es","ES"), t("observe.action.locale.es"), t("observe.action.locale.es.tip")); + super(ui, ACTION_NAME, new Locale("es", "ES"), t("observe.action.locale.es"), t("observe.action.locale.es.tip")); putValue(MNEMONIC_KEY, (int) 'E'); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java index e37def7..52bf553 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java @@ -22,12 +22,12 @@ package fr.ird.observe.application.swing.ui.actions.storage; * #L% */ -import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.application.swing.ui.storage.tabs.ConfigUI; +import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java index e5a2747..9f8bf9e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java @@ -22,12 +22,12 @@ package fr.ird.observe.application.swing.ui.actions.storage; * #L% */ -import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.application.swing.ui.storage.tabs.ConfigUI; +import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java index ae1d3e6..1c13ae0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -22,13 +22,13 @@ package fr.ird.observe.application.swing.ui.actions.storage; * #L% */ -import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.application.swing.db.constants.ConnexionStatus; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.storage.StorageUI; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.application.swing.ui.storage.tabs.ConfigUI; +import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -74,7 +74,7 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { StorageUI parentContainer = configUI.getParentContainer(StorageUI.class); SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); - if (ConnexionStatus.SUCCESS== configUI.getModel().getConnexionStatus()) { + if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { parentContainer.getNextAction().requestFocusInWindow(); } }); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java index 6d739b1..fb3f8c0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java @@ -22,13 +22,13 @@ package fr.ird.observe.application.swing.ui.actions.storage; * #L% */ -import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import fr.ird.observe.application.swing.db.constants.ConnexionStatus; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.storage.StorageUI; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.application.swing.ui.storage.tabs.ConfigUI; +import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java index 10402cb..98f8f38 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java @@ -28,19 +28,19 @@ import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; import fr.ird.observe.application.swing.ui.admin.consolidate.ConsolidateModel; import fr.ird.observe.application.swing.ui.admin.consolidate.ConsolidateUI; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroModel; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroUI; import fr.ird.observe.application.swing.ui.admin.export.ExportModel; import fr.ird.observe.application.swing.ui.admin.export.ExportUI; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroModel; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.report.ReportModel; import fr.ird.observe.application.swing.ui.admin.report.ReportUI; import fr.ird.observe.application.swing.ui.admin.resume.ShowResumeUI; import fr.ird.observe.application.swing.ui.admin.save.SaveLocalModel; import fr.ird.observe.application.swing.ui.admin.save.SaveLocalUI; +import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroModel; +import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.SynchronizeModel; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.SynchronizeUI; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroModel; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.validate.ValidateModel; import fr.ird.observe.application.swing.ui.admin.validate.ValidateUI; import jaxx.runtime.swing.wizard.ext.WizardExtStep; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java index 20441e2..0065c62 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java @@ -29,8 +29,8 @@ import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.ui.admin.resume.ShowResumeUI; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java index 0d9a84e..373fd76 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java @@ -28,11 +28,11 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.application.swing.ui.admin.report.ReportModel; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; -import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.reference.DataReferenceList; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.constants.ObserveModelType; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; import fr.ird.observe.services.service.data.seine.TripSeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java index a1fa8ea..bf978ef 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java @@ -46,6 +46,7 @@ public class ConsolidateModel extends AdminActionModel { /** la source de données où effectuer la consolidation des données */ private ObserveSwingDataSource source; private final ProgressModel progressModel = new ProgressModel(); + public ConsolidateModel() { super(AdminStep.CONSOLIDATE); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index 657fa87..49fc83c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -36,11 +36,11 @@ import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.content.ref.usage.UsageForDisplayUI; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.util.ProgressModel; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.reference.ReferenceMap; -import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.seine.TripSeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java index 81597c1..425fea6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.admin.export; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import java.io.Serializable; import java.util.Objects; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx index a536d72..e31168b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx @@ -64,7 +64,7 @@ protected void finalize() throws Throwable { constructorParams='ObserveModelType.class' onItemStateChanged='getHandler().setModelTypeFromEvent(event)'/> </cell> - </row> + </row> <row> <cell anchor="west"> <JLabel id='reportFileLabel'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java index 36d36a0..a7f6b8f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java @@ -29,13 +29,13 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ObserveModelType; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.report.DataMatrix; import fr.ird.observe.services.service.actions.report.Report; -import fr.ird.observe.services.service.actions.report.ReportVariable; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.report.ReportService; +import fr.ird.observe.services.service.actions.report.ReportVariable; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.editor.bean.BeanComboBox; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java index 56e8f4b..e4af9c1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java @@ -122,8 +122,8 @@ public class ResultTableModel extends AbstractTableModel { if (log.isInfoEnabled()) { log.info("final data dimension : " + - allData.getDimension() + " vs " + - data.getDimension() + allData.getDimension() + " vs " + + data.getDimension() ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java index dabe7ef..7a7167f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java @@ -68,6 +68,7 @@ public class DataSynchroModel extends AdminActionModel { protected final DefaultListModel<DataSynchronizeTaskSupport> tasks; private final ProgressModel progressModel = new ProgressModel(); + public DataSynchroModel() { super(AdminStep.DATA_SYNCHRONIZE); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java index 0744019..032a746 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task; */ import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import static org.nuiton.i18n.I18n.t; @@ -40,7 +40,7 @@ public class CopyToLeftDataSynchronizeTask extends DataSynchronizeTaskSupport { public CopyToLeftDataSynchronizeTask(ReferentialReference<ProgramDto> programReference, DataReference tripReference, boolean tripExistOnLeft) { super(programReference, tripReference, "copyToLeft"); - this.tripExistOnLeft=tripExistOnLeft; + this.tripExistOnLeft = tripExistOnLeft; } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java index 85fea24..c1769ee 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task; */ import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java index 4242ff6..21f5915 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java @@ -26,8 +26,8 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import javax.swing.Icon; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java index 161dfa9..933ee37 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task; */ import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java index 1e626c0..460ab3b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task; */ import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java index a17ca41..ba0f3ac 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Objects; @@ -39,7 +39,7 @@ public class ObsoleteReferentialReference<R extends ReferentialDto> { private final ReferentialReference<R> referentialReference; - public ObsoleteReferentialReference(Class<R>referentialName, ReferentialReference<R> referentialReference) { + public ObsoleteReferentialReference(Class<R> referentialName, ReferentialReference<R> referentialReference) { this.referentialReference = referentialReference; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java index 0726e12..62c8260 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java @@ -22,13 +22,13 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; +import fr.ird.observe.application.swing.ui.admin.AdminActionModel; +import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackResults; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeEngine; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeResult; -import fr.ird.observe.application.swing.ui.admin.AdminActionModel; -import fr.ird.observe.application.swing.ui.admin.AdminStep; import jaxx.runtime.swing.model.JaxxDefaultListModel; import jaxx.runtime.swing.wizard.ext.WizardState; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java index 310aa21..c09c077 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java @@ -28,8 +28,8 @@ import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferen import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackRequest; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackRequests; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java index 3c526f7..987af24 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng; */ import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.editor.bean.BeanComboBox; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java index 93380e9..7ac0862 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java @@ -33,9 +33,9 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.DesactivateReferentialSynchronizeTask; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.ReferentialSynchronizeTaskSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java index 8fbc81f..c016a3e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng; * #L% */ -import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTaskType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; +import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTaskType; import javax.swing.Icon; import java.util.function.Predicate; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java index 6ae77ba..b85cc97 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java @@ -46,7 +46,7 @@ public class ReferentialSynchronizeTaskListModel extends DefaultListModel<Refere if (addedTasks.isEmpty()) { return; } - + tasksIsAdjusting = true; try { int minIndex = size(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java index 092bbf4..eb35f7d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java @@ -22,12 +22,12 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.AddReferentialSynchronizeTask; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Collection; import java.util.function.Predicate; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java index 7c4ea0b..5f7d164 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java @@ -22,11 +22,11 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.AddReferentialSynchronizeTask; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 12/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java index 7b50991..f22f515 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java @@ -22,11 +22,11 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.DeleteReferentialSynchronizeTask; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java index 96130ca..ec57934 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java @@ -25,8 +25,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.DesactivateReferentialSynchronizeTask; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java index c798a63..be89c52 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java @@ -22,11 +22,11 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.RevertReferentialSynchronizeTask; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 12/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java index 59181ad..b982255 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java @@ -22,11 +22,11 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.SkipReferentialSynchronizeTask; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 12/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java index c5ccd65..b9cf5ec 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java @@ -34,8 +34,8 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.Refe import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.ReferentialSynchronizeTaskSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java index 108d800..2a0adea 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java @@ -22,12 +22,12 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.UpdateReferentialSynchronizeTask; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Collection; import java.util.function.Predicate; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java index 8f9fefc..87c367b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 09/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java index 77fb632..ac5ecbe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 09/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java index 798136c..0deece2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java index a1f42f9..c9cc3f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java @@ -24,11 +24,11 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest; import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTaskType; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import javax.swing.Icon; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java index 4e7dada..989aa88 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java @@ -23,10 +23,10 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java index 77b1ad3..ba8d334 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 09/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java index 254df0e..24d8926 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java @@ -22,10 +22,10 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; /** * Created on 09/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java index dd6e3dd..15fffa5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 09/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java index b200c43..f461e6b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java @@ -24,11 +24,11 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferentialSynchroNodeSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.RootReferentialSynchroNode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode; +import fr.ird.observe.services.dto.referential.ReferentialDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java index f99eb06..5a9660b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java @@ -33,9 +33,9 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.RootReferentialSynchroNode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.UpdatedReferenceReferentialSynchroNode; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiff; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffState; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffs; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java index 4614a73..71ad80e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 11/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java index 98dc46e..d1bec90 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 09/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java index 2f71368..d88d3e0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Created on 11/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jaxx index ce51a16..746ac5c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateConfigUI.jaxx @@ -167,8 +167,8 @@ protected void finalize() throws Throwable { </cell> <cell weightx='1' fill="horizontal" columns="2"> <JTextField - id='validationReportFilenameText' - onKeyReleased='getHandler().changeValidationReportFilename(this, ((JTextField)event.getSource()).getText())'/> + id='validationReportFilenameText' + onKeyReleased='getHandler().changeValidationReportFilename(this, ((JTextField)event.getSource()).getText())'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java index 5d5ad6a..b0ae56b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java @@ -30,8 +30,8 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.application.swing.validation.ValidationModelMode; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType; import fr.ird.observe.services.service.actions.validate.ValidateService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java index c11f4ef..960977f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java @@ -38,9 +38,9 @@ import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.util.ObserveValidationMessageTableRenderer; import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.application.swing.validation.ValidationModelMode; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 29344b8..a110078 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -42,17 +42,17 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.util.SpringUtilities; import fr.ird.observe.application.swing.validation.ValidationContext; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.form.FormRequestDefinition; -import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.form.FormRequestKeyDefinition; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; import jaxx.runtime.JAXXContext; import jaxx.runtime.context.DefaultJAXXContext; import jaxx.runtime.swing.editor.bean.BeanComboBox; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java index b153af7..db4148e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -35,12 +35,12 @@ import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.util.BooleanEditor; import fr.ird.observe.application.swing.ui.util.tripMap.ObserveMapPane; import fr.ird.observe.application.swing.validation.ObserveSwingValidator; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import jaxx.runtime.JAXXValidator; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java index 392132c..ec354a1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java @@ -24,13 +24,13 @@ package fr.ird.observe.application.swing.ui.content; import com.google.common.collect.ImmutableMap; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.DataDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; -import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index 2b2bbeb..35f3202 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -32,11 +32,11 @@ import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.validation.ValidationContext; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineHelper; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineService; import jaxx.runtime.spi.UIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index ba6751c..47eb55f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -29,9 +29,9 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.common.constants.seine.Ownership; import fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; import fr.ird.observe.services.dto.result.SaveResultDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java index e5a71cd..c992178 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -30,8 +30,8 @@ import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index 5fcda66..5623d20 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -31,9 +31,9 @@ import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.common.constants.seine.SchoolType; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java index 56e1738..79168fa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -27,10 +27,10 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.dto.reference.DataReference; import jaxx.runtime.swing.editor.bean.BeanListHeader; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java index e1203e6..f70d297 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.list; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.reference.DataReference; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 8beed9a..8508b4b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -29,9 +29,9 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.n; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java index b830929..31878d3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -30,10 +30,10 @@ import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.ProgramLonglineNavigationTreeNode; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.n; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java index a30b440..86a8c5d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.list.impl.longline; */ import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import java.util.List; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java index 03a6987..d525e2b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -30,8 +30,8 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import jaxx.runtime.spi.UIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index ccb660b..1c1eba2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -29,11 +29,11 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.validation.ValidationContext; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import jaxx.runtime.spi.UIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java index 450bdc6..7a6a5a3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -30,13 +30,13 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import fr.ird.observe.application.swing.ui.util.tripMap.TripMapUI; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java index d72d418..f27d008 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -28,8 +28,8 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.validation.ValidationContext; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java index 3905882..6283f2d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -29,11 +29,11 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import fr.ird.observe.application.swing.ui.util.tripMap.TripMapUI; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java index 1e115f0..2a54b91 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java @@ -36,14 +36,14 @@ import fr.ird.observe.application.swing.ui.content.ref.usage.UsageForDisplayUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.validation.ValidationContext; import fr.ird.observe.common.constants.ReferenceStatus; +import fr.ird.observe.services.ObserveFormRequests; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferenceMap; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.ObserveFormRequests; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.referential.ReferentialService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeSeineUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeSeineUI.java index fdfad52..3701cb4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeSeineUI.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeSeineUI.java @@ -34,6 +34,6 @@ import jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeSeineUI extends ReferenceHomeUI { public ReferenceHomeSeineUI(JAXXContext param0) { - super(((JAXXInitialContext)param0).add(new ReferenceHomeUIModel.ReferenceHomeSeineUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeSeineUIModel())); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java index 79ddde4..6300189 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; */ import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.GearDto; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java index 0409754..1bc1854 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; */ import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java index d7a0410..d326753 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; */ import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java index c58b67d..4c49f4c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; */ import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java index 12c7f98..7fc047d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java @@ -25,13 +25,13 @@ package fr.ird.observe.application.swing.ui.content.ref.usage; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferenceMap; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import jaxx.runtime.JAXXObject; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.editor.bean.BeanComboBox; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellEditor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellEditor.java index f81021d..6ea353e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellEditor.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellEditor.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.content.table.impl; * #L% */ +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; -import fr.ird.observe.services.dto.reference.ReferentialReference; import org.nuiton.jaxx.widgets.number.NumberCellEditor; import javax.swing.JTable; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellRenderer.java index 4053ef2..29ab7ed 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellRenderer.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.swing.ui.content.table.impl; */ import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; -import fr.ird.observe.services.dto.reference.ReferentialReference; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index 8077d9d..a1206d7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -37,7 +37,6 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.table.AutotSelectRowAndShowPopupActionSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -49,9 +48,10 @@ import fr.ird.observe.services.dto.longline.SetLonglineCatchHelper; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java index 8f9c1eb..0d42539 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java @@ -30,9 +30,9 @@ import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterHelper; import fr.ird.observe.services.dto.longline.EncounterDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java index e87b877..3a0bc01 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java @@ -30,8 +30,8 @@ import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineHelper; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; -import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.GearDto; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 7538154..d35a99f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -40,10 +40,10 @@ import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDt import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseHelper; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; @@ -65,7 +65,6 @@ import java.awt.Insets; import java.beans.PropertyChangeListener; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java index 7215832..ab97d24 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java @@ -24,9 +24,9 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; -import fr.ird.observe.services.dto.reference.ReferentialReference; /** * Created on 4/7/15. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java index 1d7d3d6..609f348 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BasketWithSectionIdDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -32,6 +31,7 @@ import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.LonglinePositionAwareDto; import fr.ird.observe.services.dto.longline.LonglinePositionSetDto; import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.reference.DataReference; import jaxx.runtime.swing.editor.bean.BeanComboBox; import java.beans.PropertyChangeListener; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java index 4e044e1..22cb050 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java @@ -35,9 +35,9 @@ import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.SetLonglineTdrHelper; import fr.ird.observe.services.dto.longline.TdrDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TdrService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java index 1ce9bcb..325d418 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; */ import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java index a8e1c48..bd454af 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java @@ -26,8 +26,8 @@ import com.google.common.collect.Sets; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; -import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +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.GearUseFeaturesSeineHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 7781d4e..5682e7d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -35,10 +35,10 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.application.swing.ui.content.table.impl.GearUseFeatureMeasurementCellEditor; import fr.ird.observe.application.swing.ui.content.table.impl.GearUseFeatureMeasurementCellRenderer; import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; @@ -65,7 +65,6 @@ import java.awt.Insets; import java.beans.PropertyChangeListener; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 0283fba..faafb80 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -30,11 +30,11 @@ import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferen import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; 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; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index e94df8b..6ffe9b5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -28,8 +28,8 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 4257853..73be194 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -26,9 +26,9 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index d3ceefa..cb0fdf1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -26,9 +26,9 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index 9d3945e..853aaf5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -27,9 +27,9 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java index f567679..845ec71 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -29,9 +29,9 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index a193b9b..a9d54e7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -29,9 +29,9 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.ReferentialDto; 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; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 9062463..76f1d5c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -28,8 +28,8 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/package.html index 87c62f4..f329857 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/package.html +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/package.html @@ -22,7 +22,7 @@ <html> <body> <h1>Le paquetage des ui principales de l'application et des classes utiles pour - la couche d'ui</h1> + la couche d'ui</h1> TODO </body> </html> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java index ba45c06..5430680 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java @@ -32,9 +32,9 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java index 338965c..364e33d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java @@ -28,11 +28,11 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index b73571a..8762572 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -47,8 +47,8 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.ObserveDbUserDto; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.SqlScriptProducerService; import jaxx.runtime.spi.UIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index 7379942..c88516b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -38,10 +38,10 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.security.BadObserveWebUserPasswordException; import fr.ird.observe.services.security.ObserveWebSecurityExceptionSupport; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx index 50ec86b..f762cc5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx @@ -109,7 +109,7 @@ <JLabel constraints='BorderLayout.WEST' text='observe.storage.useRemoteStorage.config'/> <JMenuBar id='remoteMenuBar' constraints='BorderLayout.EAST'> <JMenu id='remoteMenu'> - <JMenuItem id="saveRemoteConfiguration" /> + <JMenuItem id="saveRemoteConfiguration"/> <JSeparator/> </JMenu> </JMenuBar> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java index 3ded31a..3c96826 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java @@ -24,8 +24,6 @@ package fr.ird.observe.application.swing.ui.storage.tabs; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveTextGenerator; -import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; -import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.db.constants.ConnexionStatus; import fr.ird.observe.application.swing.ui.MnemonicHelper; @@ -36,6 +34,8 @@ import fr.ird.observe.application.swing.ui.actions.storage.UseServerConfiguratio import fr.ird.observe.application.swing.ui.content.ObserveActionMap; import fr.ird.observe.application.swing.ui.storage.StorageStep; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; +import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; +import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java index 01497fa..d622c3e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -36,8 +36,8 @@ import fr.ird.observe.application.swing.ui.tree.menu.MoveRouteNodeMenuPopulator; import fr.ird.observe.application.swing.ui.tree.menu.MoveTripLonglineNodeMenuPopulator; import fr.ird.observe.application.swing.ui.tree.menu.MoveTripSeineNodeMenuPopulator; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; -import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripLonglineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripLonglineNodeMenuPopulator.java index c7bc091..3c667b1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripLonglineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripLonglineNodeMenuPopulator.java @@ -32,8 +32,8 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNaviga import fr.ird.observe.application.swing.ui.tree.navigation.nodes.RootNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.ProgramLonglineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import java.util.ArrayList; import java.util.List; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripSeineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripSeineNodeMenuPopulator.java index 04ac29e..3c25c82 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripSeineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripSeineNodeMenuPopulator.java @@ -32,8 +32,8 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNaviga import fr.ird.observe.application.swing.ui.tree.navigation.nodes.RootNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import java.util.ArrayList; import java.util.List; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java index fc134d2..6bd3521 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java @@ -41,16 +41,16 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.RouteSein import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.RoutesSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.SetSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.TripSeineNavigationTreeNode; -import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.binder.ReferenceBinderEngine; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; 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.binder.ReferenceBinderEngine; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramHelper; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.RouteDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java index c22d252..3e68582 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java @@ -94,7 +94,7 @@ public class NavigationTreeHeaderHandler implements UIHandler<NavigationTreeHead NavigationTreeNodeSupport<?> selectedNode = tree.getSelectedNode(); if (log.isInfoEnabled()) { - log.info("Selected node: "+selectedNode); + log.info("Selected node: " + selectedNode); } tree.clearSelection(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java index d0f7400..db7e45f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java @@ -31,12 +31,12 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.referential.Ref import fr.ird.observe.application.swing.ui.tree.navigation.nodes.referential.ReferentialsLonglineNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.referential.ReferentialsSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramHelper; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; import fr.ird.observe.services.service.data.NavigationRequest; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java index bb2d2bf..2f80831 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java @@ -198,7 +198,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor Enumeration<NavigationTreeNodeSupport> children = children(); while (children.hasMoreElements()) { NavigationTreeNodeSupport node = children.nextElement(); - if (childType.isAssignableFrom((Class)node.getUserObject())) { + if (childType.isAssignableFrom((Class) node.getUserObject())) { return node; } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java index 604415e..5f88ce9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.reference.AbstractReference; import org.nuiton.decorator.Decorator; import java.awt.Color; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java index 32b97aa..937fbe2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes; */ import fr.ird.observe.application.swing.ui.content.ContentUI; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import org.apache.commons.collections4.EnumerationUtils; import java.util.Iterator; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java index fa2d9e8..b3d3c28 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java @@ -26,9 +26,9 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.content.list.impl.longline.ActivityLonglinesUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; -import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java index ca42259..2e48b0f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java @@ -24,10 +24,10 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; import fr.ird.observe.application.swing.ui.content.open.impl.longline.ActivityLonglineUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java index 1e858ae..a04a46b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java @@ -24,10 +24,10 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import org.apache.commons.collections4.EnumerationUtils; import java.util.Collection; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java index 27d82af..955f413 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java @@ -24,8 +24,8 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; import fr.ird.observe.application.swing.ui.content.impl.longline.SetLonglineUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java index 6294c43..5d62b8b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java @@ -24,9 +24,9 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; import fr.ird.observe.application.swing.ui.content.open.impl.longline.TripLonglineUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; +import fr.ird.observe.services.dto.reference.DataReference; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java index 3dafa6d..8353439 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java @@ -25,8 +25,8 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.collections4.EnumerationUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeModel.java index d28ae89..1af4fac 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeModel.java @@ -33,13 +33,13 @@ import fr.ird.observe.application.swing.ui.tree.selection.nodes.ReferentialsSele import fr.ird.observe.application.swing.ui.tree.selection.nodes.RootSelectionTreeNode; import fr.ird.observe.application.swing.ui.tree.selection.nodes.SelectionTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.selection.nodes.TripSelectionTreeNodeSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialHelper; -import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.NavigationRequest; import fr.ird.observe.services.service.data.NavigationResult; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ProgramSelectionTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ProgramSelectionTreeNode.java index c869e4b..dc5d534 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ProgramSelectionTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ProgramSelectionTreeNode.java @@ -24,10 +24,10 @@ package fr.ird.observe.application.swing.ui.tree.selection.nodes; import com.google.common.collect.ImmutableList; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.collections4.EnumerationUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java index a2102bd..736a52d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.tree.selection.nodes; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.reference.AbstractReference; import org.nuiton.decorator.Decorator; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java index e784b89..f84cfe8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.swing.ui.tree.selection.nodes; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; +import fr.ird.observe.services.dto.reference.DataReference; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JVetoableTabbedPane.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JVetoableTabbedPane.java index f07d817..616139f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JVetoableTabbedPane.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JVetoableTabbedPane.java @@ -93,7 +93,7 @@ public class JVetoableTabbedPane extends JTabbedPane { * If response is {@code false}, then we should not quit the current tab. * * @param currentSelectedIndex the current index of the selected tab - * @param newSelectedIndex the index of the tab we want to go on + * @param newSelectedIndex the index of the tab we want to go on * @return {@code true} if we can do the change, {@code false} otherwise. */ boolean canChangeTab(int currentSelectedIndex, int newSelectedIndex); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java index 185fe2f..f9bb7a5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java @@ -233,7 +233,7 @@ public abstract class EditableTableModelSupport<E extends Serializable> extends setSelectedRowIndex(-1); // clear selection - int insertRow = currentRow == getRowCount() ? currentRow : currentRow + 1; + int insertRow = currentRow == getRowCount() ? currentRow : currentRow + 1; if (log.isInfoEnabled()) { log.info("Insert after selected row: " + currentRow + " :: " + insertRow); } @@ -526,7 +526,7 @@ public abstract class EditableTableModelSupport<E extends Serializable> extends int keyCode = e.getKeyCode(); if (keyCode == KeyEvent.VK_LEFT || - (keyCode == KeyEvent.VK_TAB && e.isShiftDown())) { + (keyCode == KeyEvent.VK_TAB && e.isShiftDown())) { e.consume(); if (editor != null) { editor.stopCellEditing(); @@ -534,7 +534,7 @@ public abstract class EditableTableModelSupport<E extends Serializable> extends previousCellAction.actionPerformed(null); } else if (keyCode == KeyEvent.VK_RIGHT || - keyCode == KeyEvent.VK_TAB) { + keyCode == KeyEvent.VK_TAB) { e.consume(); if (editor != null) { editor.stopCellEditing(); @@ -542,7 +542,7 @@ public abstract class EditableTableModelSupport<E extends Serializable> extends nextCellAction.actionPerformed(null); } else if (keyCode == KeyEvent.VK_UP || - (keyCode == KeyEvent.VK_ENTER && e.isShiftDown())) { + (keyCode == KeyEvent.VK_ENTER && e.isShiftDown())) { e.consume(); if (editor != null) { editor.stopCellEditing(); @@ -550,7 +550,7 @@ public abstract class EditableTableModelSupport<E extends Serializable> extends previousRowAction.actionPerformed(null); } else if (e.getKeyCode() == KeyEvent.VK_ENTER || - keyCode == KeyEvent.VK_DOWN) { + keyCode == KeyEvent.VK_DOWN) { e.consume(); if (editor != null) { editor.stopCellEditing(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableCellAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableCellAction.java index dc36ef2..aec4513 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableCellAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableCellAction.java @@ -58,7 +58,7 @@ public class MoveToNextEditableCellAction<M extends EditableTableModelSupport> e if (log.isDebugEnabled()) { log.debug("Move to previous editable cell " + - getCellCoordinate(currentRow, currentColumn)); + getCellCoordinate(currentRow, currentColumn)); } int columnCount = getColumnCount(); @@ -80,7 +80,7 @@ public class MoveToNextEditableCellAction<M extends EditableTableModelSupport> e if (currentRow == rowCount) { - if (isCreateNewRow(currentRow -1)) { + if (isCreateNewRow(currentRow - 1)) { // create a new row in model addNewRow(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableRowAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableRowAction.java index 22ce746..5b471d8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableRowAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToNextEditableRowAction.java @@ -57,7 +57,7 @@ public class MoveToNextEditableRowAction<M extends EditableTableModelSupport> ex if (log.isDebugEnabled()) { log.debug("Move to next row editable cell " + - getCellCoordinate(currentRow, currentColumn)); + getCellCoordinate(currentRow, currentColumn)); } int rowCount = getRowCount(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableCellAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableCellAction.java index 7339125..3388871 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableCellAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableCellAction.java @@ -57,7 +57,7 @@ public class MoveToPreviousEditableCellAction<M extends EditableTableModelSuppor if (log.isDebugEnabled()) { log.debug("Move to previous editable cell, " + - getCellCoordinate(currentRow, currentColumn)); + getCellCoordinate(currentRow, currentColumn)); } int columnCount = getColumnCount(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableRowAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableRowAction.java index 1e41491..474f685 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableRowAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/MoveToPreviousEditableRowAction.java @@ -58,7 +58,7 @@ public class MoveToPreviousEditableRowAction<M extends EditableTableModelSupport if (log.isDebugEnabled()) { log.debug("Move to previous row editable cell " + - getCellCoordinate(currentRow, currentColumn)); + getCellCoordinate(currentRow, currentColumn)); } if (currentRow > 0) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/ObserveBooleanTableCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/ObserveBooleanTableCellRenderer.java index 8afc241..bbd7198 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/ObserveBooleanTableCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/ObserveBooleanTableCellRenderer.java @@ -34,7 +34,7 @@ import java.util.function.Predicate; /** * TODO A remonter dans JAXX. - * + * * Created on 14/08/15. * * @author Tony Chemit - dev@tchemit.fr diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java index e75e19c..ab7abdf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java @@ -156,8 +156,8 @@ public class ObserveMapPane extends JMapPane { protected static int INTER_AXIS_TEXT = 3; protected static double FONT_SIZE = 12; - - + + protected void paintCompass(Graphics graphics) { Point center = new Point(getWidth() - CENTER_MARGIN, CENTER_MARGIN); @@ -229,7 +229,7 @@ public class ObserveMapPane extends JMapPane { for (ObserveMapPaneLegendItem item : legendItems) { Rectangle2D labelArea = fm.getStringBounds(item.getLabel(), graphics); - maxLabelWidth = Math.max((int)labelArea.getWidth(), maxLabelWidth); + maxLabelWidth = Math.max((int) labelArea.getWidth(), maxLabelWidth); } @@ -279,8 +279,8 @@ public class ObserveMapPane extends JMapPane { int labelMarginBottom = ((ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT - fm.getHeight()) / 2) + fm.getDescent(); graphics.drawString(item.getLabel(), - x + LEGEND_MARGIN + ObserveMapPaneLegendItem.LEGEND_SYMBOL_WIDTH, - y + ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT - labelMarginBottom); + x + LEGEND_MARGIN + ObserveMapPaneLegendItem.LEGEND_SYMBOL_WIDTH, + y + ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT - labelMarginBottom); y += ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT; @@ -298,7 +298,6 @@ public class ObserveMapPane extends JMapPane { } - @Override public void paint(Graphics graphics) { @@ -313,10 +312,10 @@ public class ObserveMapPane extends JMapPane { } protected enum CardinalPoint { - NORTH(-1, 0, 0, -1, n("observe.content.map.north")), - SOUTH( 1, 0, 0, 1, n("observe.content.map.south")), - WEST ( 0, -1, 1, 0, n("observe.content.map.west")), - EST ( 0, 1, -1, 0, n("observe.content.map.east")); + NORTH(-1, 0, 0, -1, n("observe.content.map.north")), + SOUTH(1, 0, 0, 1, n("observe.content.map.south")), + WEST(0, -1, 1, 0, n("observe.content.map.west")), + EST(0, 1, -1, 0, n("observe.content.map.east")); protected int matrix00; protected int matrix01; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java index faf5669..3ed20a8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java @@ -37,7 +37,6 @@ 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.services.service.referential.ReferentialService; import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import fr.ird.observe.services.service.data.longline.SetLonglineService; import fr.ird.observe.services.service.data.longline.TripLonglineService; @@ -46,6 +45,7 @@ import fr.ird.observe.services.service.data.seine.FloatingObjectService; import fr.ird.observe.services.service.data.seine.RouteService; import fr.ird.observe.services.service.data.seine.SetSeineService; import fr.ird.observe.services.service.data.seine.TripSeineService; +import fr.ird.observe.services.service.referential.ReferentialService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java index 6ee7322..c9b29cd 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java @@ -38,8 +38,8 @@ import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationCont import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceFactory; import fr.ird.observe.services.ObserveServiceInitializer; -import fr.ird.observe.services.runner.ObserveServiceMainFactory; import fr.ird.observe.services.gson.ObserveDtoGsonSupplier; +import fr.ird.observe.services.runner.ObserveServiceMainFactory; import org.debux.webmotion.server.call.HttpContext; import org.nuiton.version.Version; @@ -56,7 +56,7 @@ public class ObserveWebApplicationContext implements Closeable { public static final String MISSING_APPLICATION_CONTEXT = ObserveWebApplicationContext.class.getSimpleName() + " not found. You probably forgot to" + - " register " + ObserveWebApplicationListener.class.getName() + " in your web.xml"; + " register " + ObserveWebApplicationListener.class.getName() + " in your web.xml"; protected ObserveDtoGsonSupplier gsonSupplier; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContextInitException.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContextInitException.java index d103f28..9e7bfb6 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContextInitException.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContextInitException.java @@ -28,7 +28,7 @@ package fr.ird.observe.application.web; * @author Tony Chemit - dev@tchemit.fr */ public class - ObserveWebApplicationContextInitException extends RuntimeException { +ObserveWebApplicationContextInitException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java index 520818f..ddb5d95 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java @@ -25,8 +25,8 @@ package fr.ird.observe.application.web; import com.google.common.base.Strings; import com.google.gson.Gson; import fr.ird.observe.application.web.request.ObserveWebRequestContext; -import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRestConstants; +import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.apache.commons.lang3.StringUtils; import org.debux.webmotion.server.WebMotionFilter; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java index 0b7574f..6b1fe76 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java @@ -27,15 +27,15 @@ import fr.ird.observe.application.web.request.ObserveWebRequestContext; import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationContext; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; -import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.configuration.rest.ObserveDataSourceConnectionRest; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.rest.ObserveDataSourceConnectionRest; +import fr.ird.observe.services.dto.ObserveDbUserDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.dto.ObserveDbUserDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java index 33178b8..04e0f4c 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.web.controller.v1; * #L% */ +import fr.ird.observe.services.http.ObserveHttpError; import fr.ird.observe.services.security.ObserveWebSecurityExceptionSupport; import fr.ird.observe.services.security.UnauthorizedException; -import fr.ird.observe.services.http.ObserveHttpError; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.WebMotionException; import org.debux.webmotion.server.call.HttpContext; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java index 60cb3bb..a374d48 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java @@ -24,9 +24,9 @@ package fr.ird.observe.application.web.controller.v1.actions.synchro.referential import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceStates; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java index 7270a3a..10967c5 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.web.controller.v1.actions.synchro.referential */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; @@ -42,7 +42,7 @@ public class UnidirectionalReferentialSynchronizeLocalServiceController extends } @Override - public <R extends ReferentialDto>Set<String> filterIdsUsedInLocalSource(Class<R> referentialName, Set<String> ids) { + public <R extends ReferentialDto> Set<String> filterIdsUsedInLocalSource(Class<R> referentialName, Set<String> ids) { return getAuthenticatedService().filterIdsUsedInLocalSource(referentialName, ids); } diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java index 5fe1d29..dc1d7f7 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java @@ -23,10 +23,10 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.data.longline.ActivityLonglineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java index ca896d4..2ab8643 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java index 4afbf81..41d1128 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java @@ -24,11 +24,11 @@ package fr.ird.observe.application.web.controller.v1.data.longline; import com.google.common.collect.ImmutableList; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.reference.DataReferenceList; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java index 38cb40c..54fc9e4 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.data.seine.ActivitySeineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java index 62f22a2..11f0c10 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.data.seine.FloatingObjectService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java index ed68222..59a49c6 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.data.seine.RouteService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java index 6ada048..ae542cb 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.data.seine.SetSeineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java index 317325a..9a14cca 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java @@ -24,10 +24,10 @@ package fr.ird.observe.application.web.controller.v1.data.seine; import com.google.common.collect.ImmutableList; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; +import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceList; -import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java index e25f3af..2e4ac69 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java @@ -25,11 +25,11 @@ package fr.ird.observe.application.web.controller.v1.referential; import com.google.common.collect.ImmutableSet; import com.google.common.collect.SetMultimap; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/sql/SqlScriptProducerServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/sql/SqlScriptProducerServiceController.java index 540d807..c8aa48b 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/sql/SqlScriptProducerServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/sql/SqlScriptProducerServiceController.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.sql; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; import fr.ird.observe.services.service.sql.DeleteSqlScriptProducerRequest; -import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.SqlScriptProducerService; /** diff --git a/application-web/src/main/java/fr/ird/observe/application/web/converter/ObserveDtoConverter.java b/application-web/src/main/java/fr/ird/observe/application/web/converter/ObserveDtoConverter.java index 9cc1c42..114a72d 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/converter/ObserveDtoConverter.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/converter/ObserveDtoConverter.java @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory; * * @author Tony Chemit - dev@tchemit.fr */ -public class ObserveDtoConverter extends AbstractConverter { +public class ObserveDtoConverter extends AbstractConverter { /** Logger. */ private static final Log log = LogFactory.getLog(ObserveDtoConverter.class); diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java index c75d37b..890a144 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java @@ -37,7 +37,7 @@ import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class DateInjector implements ExecutorParametersInjectorHandler.Injector{ +public class DateInjector implements ExecutorParametersInjectorHandler.Injector { private static final Log log = LogFactory.getLog(DateInjector.class); diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java index 97a3702..8626ed7 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java @@ -66,7 +66,7 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!"); String[] values = (String[]) parameterTree.getValue(); - for (String value: values) { + for (String value : values) { builder.add(value); } diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java index a5cbe0a..ebc5796 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java @@ -41,7 +41,7 @@ import java.lang.reflect.TypeVariable; * * @author Tony Chemit - dev@tchemit.fr */ -public class ObserveDtoInjector extends AbstractConverter implements ExecutorParametersInjectorHandler.Injector { +public class ObserveDtoInjector extends AbstractConverter implements ExecutorParametersInjectorHandler.Injector { /** Logger. */ private static final Log log = LogFactory.getLog(ObserveDtoInjector.class); @@ -60,7 +60,7 @@ public class ObserveDtoInjector extends AbstractConverter implements ExecutorPar Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - String gsonContent= ((String[])parameterTree.getValue())[0]; + String gsonContent = ((String[]) parameterTree.getValue())[0]; if (generic instanceof TypeVariable) { TypeVariable typeVariable = (TypeVariable) generic; @@ -69,7 +69,7 @@ public class ObserveDtoInjector extends AbstractConverter implements ExecutorPar Call.ParameterTree parameterizedTypeParameterTree = call.getParameterTree().getObject().get(parameterizedTypeParam); - String parameterizedTypeClassName= ((String[])parameterizedTypeParameterTree.getValue())[0]; + String parameterizedTypeClassName = ((String[]) parameterizedTypeParameterTree.getValue())[0]; try { generic = Class.forName(parameterizedTypeClassName); diff --git a/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java b/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java index 68589f8..7bb5c06 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java @@ -25,9 +25,9 @@ package fr.ird.observe.application.web.request; import fr.ird.observe.application.web.ObserveWebApplicationContext; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; -import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; +import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.security.AdminApiKeyNotFoundException; import fr.ird.observe.services.security.AuthenticationTokenNotFoundException; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java index 4c610b8..7501317 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java @@ -32,9 +32,9 @@ import fr.ird.observe.application.web.configuration.db.ObserveWebDatabases; import fr.ird.observe.application.web.configuration.user.ObserveWebUser; import fr.ird.observe.application.web.configuration.user.ObserveWebUserPermission; import fr.ird.observe.application.web.configuration.user.ObserveWebUsers; -import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; +import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.security.BadObserveWebUserPasswordException; import fr.ird.observe.services.security.InvalidAuthenticationTokenException; import fr.ird.observe.services.security.UnknownObserveWebUserException; @@ -158,7 +158,7 @@ public class ObserveWebSecurityApplicationContext implements Closeable { * * Si la base n'est pas spécifiée, on utilise alors la base par défaut du serveur. * - * @param userLogin le login de l'utilisateur + * @param userLogin le login de l'utilisateur * @param databaseName le nom de la base à utiliser * @return la configuration de source de données associée à l'utilisateur et la base donnée * @throws UnknownObserveWebUserForDatabaseException si l'utilisateur n'est pas connu diff --git a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java index 2f2dc18..9c2a2bc 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java @@ -52,15 +52,15 @@ public class ObserveWebSecurityAuthenticationTokenCache implements Closeable { public ObserveWebSecurityAuthenticationTokenCache(int maximumSize, int expireDelay) { this.authenticationTokenCache = CacheBuilder.newBuilder() - .maximumSize(maximumSize) - .expireAfterWrite(expireDelay, TimeUnit.MINUTES) - .expireAfterAccess(expireDelay, TimeUnit.MINUTES) - .removalListener((RemovalListener<String, ObserveDataSourceConfigurationAndConnection>) notification -> { - if (log.isInfoEnabled()) { - log.info(String.format("Remove authentication token: %s - %s", notification.getKey(), notification.getValue())); - } - }) - .build(); + .maximumSize(maximumSize) + .expireAfterWrite(expireDelay, TimeUnit.MINUTES) + .expireAfterAccess(expireDelay, TimeUnit.MINUTES) + .removalListener((RemovalListener<String, ObserveDataSourceConfigurationAndConnection>) notification -> { + if (log.isInfoEnabled()) { + log.info(String.format("Remove authentication token: %s - %s", notification.getKey(), notification.getValue())); + } + }) + .build(); } public ObserveDataSourceConfigurationAndConnection getDataSourceConfigurationAndConnectionIfPresent(String authenticationToken) { diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java index f0c70b4..9f42b0f 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java @@ -23,9 +23,9 @@ package fr.ird.observe.entities.longline; */ import com.google.common.base.MoreObjects; -import fr.ird.observe.persistence.Entities; import fr.ird.observe.common.CoordinateHelper; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; +import fr.ird.observe.persistence.Entities; import org.nuiton.util.DateUtil; import java.util.Date; diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java index 89019af..610b98f 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java @@ -31,7 +31,7 @@ public class BasketTopiaDao extends AbstractBasketTopiaDao<Basket> { TdrTopiaDao tdrDao = topiaDaoSupplier.getDao(Tdr.class, TdrTopiaDao.class); used = tdrDao.forBasketEquals(entity).exists(); - if (! used) { + if (!used) { CatchLonglineTopiaDao catchLonglineDao = topiaDaoSupplier.getDao(CatchLongline.class, CatchLonglineTopiaDao.class); used = catchLonglineDao.forBasketEquals(entity).exists(); @@ -41,8 +41,6 @@ public class BasketTopiaDao extends AbstractBasketTopiaDao<Basket> { return used; - - } } diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java index 29138a3..57552cf 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java @@ -28,15 +28,15 @@ public class BranchlineTopiaDao extends AbstractBranchlineTopiaDao<Branchline> { boolean used; - TdrTopiaDao tdrDao = topiaDaoSupplier.getDao(Tdr.class, TdrTopiaDao.class); - used = tdrDao.forBranchlineEquals(entity).exists(); + TdrTopiaDao tdrDao = topiaDaoSupplier.getDao(Tdr.class, TdrTopiaDao.class); + used = tdrDao.forBranchlineEquals(entity).exists(); - if (! used) { + if (!used) { - CatchLonglineTopiaDao catchLonglineDao = topiaDaoSupplier.getDao(CatchLongline.class, CatchLonglineTopiaDao.class); - used = catchLonglineDao.forBranchlineEquals(entity).exists(); + CatchLonglineTopiaDao catchLonglineDao = topiaDaoSupplier.getDao(CatchLongline.class, CatchLonglineTopiaDao.class); + used = catchLonglineDao.forBranchlineEquals(entity).exists(); - } + } return used; diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java index 00da49b..8823c02 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java @@ -31,7 +31,7 @@ public class SectionTopiaDao extends AbstractSectionTopiaDao<Section> { TdrTopiaDao tdrDao = topiaDaoSupplier.getDao(Tdr.class, TdrTopiaDao.class); used = tdrDao.forSectionEquals(entity).exists(); - if (! used) { + if (!used) { CatchLonglineTopiaDao catchLonglineDao = topiaDaoSupplier.getDao(CatchLongline.class, CatchLonglineTopiaDao.class); used = catchLonglineDao.forSectionEquals(entity).exists(); diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java index 89fa7b3..8e1189d 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java @@ -23,8 +23,8 @@ package fr.ird.observe.entities.longline; */ import com.google.common.base.MoreObjects; -import fr.ird.observe.persistence.Entities; import fr.ird.observe.common.CoordinateHelper; +import fr.ird.observe.persistence.Entities; import org.nuiton.util.DateUtil; import java.util.Date; @@ -313,18 +313,18 @@ public class SetLonglineImpl extends SetLonglineAbstract { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("haulingStartLatitude", getHaulingStartLatitude()) - .add("haulingStartLongitude", getHaulingStartLongitude()) - .add("haulingStartQuadrant", getHaulingStartQuadrant()) - .add("haulingEndLatitude", getHaulingEndLatitude()) - .add("haulingEndLongitude", getHaulingEndLongitude()) - .add("haulingEndQuadrant", getHaulingEndQuadrant()) - .add("settingStartLatitude", getSettingStartLatitude()) - .add("settingStartLongitude", getSettingStartLongitude()) - .add("settingStartQuadrant", getSettingStartQuadrant()) - .add("settingEndLatitude", getSettingEndLatitude()) - .add("settingEndLongitude", getSettingEndLongitude()) - .add("settingEndQuadrant", getSettingEndQuadrant()) - .toString(); + .add("haulingStartLatitude", getHaulingStartLatitude()) + .add("haulingStartLongitude", getHaulingStartLongitude()) + .add("haulingStartQuadrant", getHaulingStartQuadrant()) + .add("haulingEndLatitude", getHaulingEndLatitude()) + .add("haulingEndLongitude", getHaulingEndLongitude()) + .add("haulingEndQuadrant", getHaulingEndQuadrant()) + .add("settingStartLatitude", getSettingStartLatitude()) + .add("settingStartLongitude", getSettingStartLongitude()) + .add("settingStartQuadrant", getSettingStartQuadrant()) + .add("settingEndLatitude", getSettingEndLatitude()) + .add("settingEndLongitude", getSettingEndLongitude()) + .add("settingEndQuadrant", getSettingEndQuadrant()) + .toString(); } } diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java b/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java index e2dfa5b..204dc4a 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java @@ -41,7 +41,7 @@ public class TripLonglines { SetLongline setLongline = activityLongline.getSetLongline(); - if (setLongline!=null && !setLongline.isTdrEmpty()) { + if (setLongline != null && !setLongline.isTdrEmpty()) { String setLonglineTopiaId = setLongline.getTopiaId(); setIds.add(setLonglineTopiaId); diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java index 3e7f518..ca96681 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java @@ -35,8 +35,8 @@ import java.util.Optional; public class LengthLengthParameters { public static Optional<LengthLengthParameter> findLengthLengthParameter(ObserveTopiaDaoSupplier daoSupplier, - SizeMeasureType inputSizeMeasureType, - SizeMeasureType outputSizeMeasureType) { + SizeMeasureType inputSizeMeasureType, + SizeMeasureType outputSizeMeasureType) { return daoSupplier.getLengthLengthParameterDao().find(inputSizeMeasureType, outputSizeMeasureType); } diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java index a8e39ed..5fd64dd 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java @@ -91,7 +91,7 @@ public class LengthWeightParameters { return null; } - if (sizeMeasureType!=null) { + if (sizeMeasureType != null) { // on filtre par le type de mensuration entrant List<LengthWeightParameter> list2 = filterBySizeMeasureType(list, sizeMeasureType); diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java index 5657782..65f5d7d 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java @@ -22,8 +22,8 @@ package fr.ird.observe.entities.seine; import com.google.common.base.MoreObjects; -import fr.ird.observe.common.constants.seine.SchoolType; import fr.ird.observe.common.CoordinateHelper; +import fr.ird.observe.common.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.persistence.Entities; import org.apache.commons.logging.Log; diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java index a9694f5..63edc76 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java @@ -53,13 +53,13 @@ public class FloatingObjectTopiaDao extends AbstractFloatingObjectTopiaDao<Float static List<FloatingObject> findAll(TopiaSqlSupport context, String activityId, int referenceLocale) { String sql = "SELECT" + - " fo.topiaId," + - " ot." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.floatingobject fo, observe_seine.objecttype ot" + - " WHERE " + - " fo.activity = ?" + - " AND fo.objecttype = ot.topiaid" + - " ORDER BY ot." + I18nReferenceEntities.getPropertyName(referenceLocale); + " fo.topiaId," + + " ot." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " FROM observe_seine.floatingobject fo, observe_seine.objecttype ot" + + " WHERE " + + " fo.activity = ?" + + " AND fo.objecttype = ot.topiaid" + + " ORDER BY ot." + I18nReferenceEntities.getPropertyName(referenceLocale); StubSqlQuery request = new StubSqlQuery(sql, activityId, referenceLocale); return context.findMultipleResult(request); diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java b/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java index df17ea9..7edac90 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java @@ -31,8 +31,8 @@ public class NonTargetCatches { public static boolean allNonTargetCatchDataFilled(NonTargetCatch nonTargetCatch) { return !(nonTargetCatch.getCatchWeight() == null - || nonTargetCatch.getTotalCount() == null - || nonTargetCatch.getMeanWeight() == null - || nonTargetCatch.getMeanLength() == null); + || nonTargetCatch.getTotalCount() == null + || nonTargetCatch.getMeanWeight() == null + || nonTargetCatch.getMeanLength() == null); } } diff --git a/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java index 7b3b13c..7e8277b 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java @@ -23,9 +23,9 @@ package fr.ird.observe.persistence; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider; import fr.ird.observe.persistence.migration.ObserveMigrationEngine; -import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; diff --git a/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java index 6f104f3..2e7a2f2 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java @@ -34,12 +34,12 @@ public class ObserveTopiaIdFactory extends LegacyTopiaIdFactory { private static final long serialVersionUID = 1L; - public <E extends TopiaEntity> String newTopiaId(Class<E> entityType ) { + public <E extends TopiaEntity> String newTopiaId(Class<E> entityType) { double random = Math.random(); while (Double.toString(random).contains("E-")) { random = Math.random(); } - return newTopiaId(entityType, random+""); + return newTopiaId(entityType, random + ""); } } diff --git a/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java index 6f6eb88..6d847cd 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java @@ -163,10 +163,10 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { tx.doSqlWork(connection -> { String sql = String.format("SELECT DISTINCT constraint_name FROM INFORMATION_SCHEMA.Constraints " + - "WHERE CONSTRAINT_TYPE='REFERENTIAL' " + - "AND CONSTRAINT_SCHEMA='%S' " + - "AND TABLE_NAME='%S' " + - "AND COLUMN_LIST='%S';", schemaName, tableName, columnName); + "WHERE CONSTRAINT_TYPE='REFERENTIAL' " + + "AND CONSTRAINT_SCHEMA='%S' " + + "AND TABLE_NAME='%S' " + + "AND COLUMN_LIST='%S';", schemaName, tableName, columnName); try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { diff --git a/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java index 6327343..7627d22 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java @@ -52,7 +52,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { super(new ObserveMigrationCallBackForVersionResolver(TYPE)); } - protected static String getUniqueConstraintName(TopiaSqlSupport tx, final String tableName, final String columnName) { + protected static String getUniqueConstraintName(TopiaSqlSupport tx, final String tableName, final String columnName) { // recherche du nom de la constrainte final List<String> result = new ArrayList<>(); @@ -128,7 +128,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return result.get(0); } - public static String getFirstTableUniqueConstraintName(TopiaSqlSupport tx, final String tableName) { + public static String getFirstTableUniqueConstraintName(TopiaSqlSupport tx, final String tableName) { // recherche du nom de la constrainte //(); @@ -160,7 +160,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return result.get(0); } - public static Set<String> getConstraintNames(TopiaSqlSupport tx, final String tableName) { + public static Set<String> getConstraintNames(TopiaSqlSupport tx, final String tableName) { final Set<String> result = new HashSet<>(); @@ -180,7 +180,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return result; } - public static Set<String> getForeignKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { + public static Set<String> getForeignKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { final Set<String> result = new HashSet<>(); @@ -201,7 +201,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static String getForeignKeyConstraintName(TopiaSqlSupport tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { + public static String getForeignKeyConstraintName(TopiaSqlSupport tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { final List<String> result = new ArrayList<>(); @@ -288,7 +288,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static Set<String> getUniqueKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { + public static Set<String> getUniqueKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { final Set<String> result = new HashSet<>(); @@ -320,7 +320,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFK(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { + public static void removeFK(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, true); @@ -330,7 +330,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFKIfExists(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { + public static void removeFKIfExists(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, false); diff --git a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java index 7a146e3..879c334 100644 --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java @@ -24,14 +24,14 @@ package fr.ird.observe.persistence.migration.old; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; +import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; +import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.persistence.ObserveTopiaIdFactory; import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.persistence.migration.H2DataSourceMigration; import fr.ird.observe.persistence.migration.MigrationVersion; import fr.ird.observe.persistence.migration.PGDataSourceMigration; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; -import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; diff --git a/services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java b/services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java index 9a46562..bdb1ed1 100644 --- a/services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java @@ -24,7 +24,6 @@ package fr.ird.observe.services; import com.google.common.base.Preconditions; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; @@ -55,6 +54,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineActivityDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java b/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java index 74d84a0..1723a00 100644 --- a/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java @@ -25,15 +25,14 @@ package fr.ird.observe.services; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.PingService; -import fr.ird.observe.services.service.data.NavigationService; -import fr.ird.observe.services.service.referential.ReferentialService; -import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.report.ReportService; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; import fr.ird.observe.services.service.actions.validate.ValidateService; +import fr.ird.observe.services.service.data.NavigationService; +import fr.ird.observe.services.service.data.TripManagementService; import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; import fr.ird.observe.services.service.data.longline.ActivityLonglineService; @@ -59,7 +58,8 @@ import fr.ird.observe.services.service.data.seine.TargetSampleService; import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; import fr.ird.observe.services.service.data.seine.TripSeineService; -import fr.ird.observe.services.service.data.TripManagementService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; /** * Un provider de services typés. diff --git a/services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngine.java b/services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngine.java index d7e44cd..4df0c2d 100644 --- a/services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngine.java +++ b/services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngine.java @@ -23,10 +23,10 @@ package fr.ird.observe.services.binder; */ import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; /** * Pour transformer des dto en références. diff --git a/services/src/main/java/fr/ird/observe/services/dto/IdDto.java b/services/src/main/java/fr/ird/observe/services/dto/IdDto.java index f4b0968..b809f26 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/IdDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/IdDto.java @@ -57,9 +57,9 @@ public abstract class IdDto extends GeneratedIdDto { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add(PROPERTY_ID, id) - .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate) - .toString(); + .add(PROPERTY_ID, id) + .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate) + .toString(); } } diff --git a/services/src/main/java/fr/ird/observe/services/dto/form/Form.java b/services/src/main/java/fr/ird/observe/services/dto/form/Form.java index 7a0c717..fe5a000 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/form/Form.java +++ b/services/src/main/java/fr/ird/observe/services/dto/form/Form.java @@ -87,10 +87,10 @@ public class Form<R extends IdDto> implements ObserveDto, Serializable { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add(PROPERTY_TYPE, type.getName()) - .add(PROPERTY_REFERENTIAL_REFERENCE_SETS_REQUEST_NAME, referentialReferenceSetsRequestName) - .add(PROPERTY_DATA_REFERENCE_SETS_REQUEST_NAME, dataReferenceSetsRequestName) - .toString(); + .add(PROPERTY_TYPE, type.getName()) + .add(PROPERTY_REFERENTIAL_REFERENCE_SETS_REQUEST_NAME, referentialReferenceSetsRequestName) + .add(PROPERTY_DATA_REFERENCE_SETS_REQUEST_NAME, dataReferenceSetsRequestName) + .toString(); } } diff --git a/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestDefinition.java b/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestDefinition.java index 6cd2d2e..e8b94a3 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestDefinition.java +++ b/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestDefinition.java @@ -23,10 +23,10 @@ package fr.ird.observe.services.dto.form; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.ObserveReferentialReferenceSets; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.ObserveReferentialReferenceSets; import fr.ird.observe.services.dto.referential.ReferentialDto; import java.io.Serializable; @@ -77,7 +77,7 @@ public class FormRequestDefinition implements Serializable { public Class<? extends IdDto> getType() { return type; } - + public static class Builder { private final Class<? extends IdDto> type; diff --git a/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestKeyDefinition.java b/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestKeyDefinition.java index 1e9126d..0e9f101 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestKeyDefinition.java +++ b/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestKeyDefinition.java @@ -72,7 +72,7 @@ public class FormRequestKeyDefinition<D extends IdDto> implements Serializable { if (!(o instanceof FormRequestKeyDefinition)) return false; FormRequestKeyDefinition that = (FormRequestKeyDefinition) o; return Objects.equals(referenceSetDefinition.getType(), that.referenceSetDefinition.getType()) && - Objects.equals(name, that.name); + Objects.equals(name, that.name); } @Override @@ -88,8 +88,8 @@ public class FormRequestKeyDefinition<D extends IdDto> implements Serializable { @Override public String toString() { MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) - .add("name", name) - .add("type", referenceSetDefinition.getType().getSimpleName()); + .add("name", name) + .add("type", referenceSetDefinition.getType().getSimpleName()); if (log.isDebugEnabled()) { toStringHelper .add("propertyNames", Arrays.toString(referenceSetDefinition.getPropertyNames())) diff --git a/services/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java b/services/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java index 916ce80..56a5635 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java +++ b/services/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java @@ -169,7 +169,7 @@ public class SectionTemplate extends AbstractSerializableBean { SectionTemplate that = (SectionTemplate) o; return Objects.equals(floatlineLengths, that.floatlineLengths) - && Objects.equals(id, that.id); + && Objects.equals(id, that.id); } diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/AbstractReference.java b/services/src/main/java/fr/ird/observe/services/dto/reference/AbstractReference.java index 767d1f2..17f7356 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/AbstractReference.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/AbstractReference.java @@ -124,7 +124,7 @@ public abstract class AbstractReference<D extends IdDto> implements ObserveDto, } public boolean isPersisted() { - return id!=null; + return id != null; } public Date getCreateDate() { diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/DataReference.java b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReference.java index 66ac5fd..5ebb72c 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/DataReference.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReference.java @@ -47,7 +47,7 @@ public class DataReference<D extends DataDto> extends AbstractReference<D> { public static Predicate<? super DataReference> newLabelValuePredicate(final String propertyName, final Serializable propertyValue) { return (Predicate<DataReference>) input -> input.getPropertyNames().contains(propertyName) - && propertyValue.equals(input.getPropertyValue(propertyName)); + && propertyValue.equals(input.getPropertyValue(propertyName)); } public static Predicate<DataReference> newTripSeinePredicate() { @@ -61,9 +61,9 @@ public class DataReference<D extends DataDto> extends AbstractReference<D> { @Override public String toString() { MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) - .add(PROPERTY_TYPE, type.getSimpleName()) - .add(PROPERTY_ID, id) - .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate); + .add(PROPERTY_TYPE, type.getSimpleName()) + .add(PROPERTY_ID, id) + .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate); if (log.isDebugEnabled()) { toStringHelper diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSet.java b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSet.java index 550bc61..67a69ad 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSet.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSet.java @@ -40,8 +40,8 @@ public class DataReferenceSet<R extends DataDto> extends ReferenceCollectionSupp @Override public String toString() { return MoreObjects.toStringHelper(this) - .add(PROPERTY_TYPE, type.getSimpleName()) - .toString(); + .add(PROPERTY_TYPE, type.getSimpleName()) + .toString(); } protected DataReferenceSet(Class<R> type, ImmutableSet<DataReference<R>> references) { diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceMap.java b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceMap.java index 1adbd1d..3f7bebf 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceMap.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceMap.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.dto.reference; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.reference.AbstractReference; import java.util.HashMap; import java.util.Set; diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java index 35c2395..f44e690 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java @@ -80,7 +80,7 @@ public class ReferenceSetDefinition<D extends IdDto> implements Serializable { @Override public String toString() { MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) - .add("type", type.getSimpleName()); + .add("type", type.getSimpleName()); if (log.isDebugEnabled()) { toStringHelper .add("propertyNames", Arrays.toString(propertyNames)) diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java index 0dc0d36..4dc1a73 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java @@ -47,19 +47,19 @@ public class PersonHelper extends GeneratedPersonHelper { public static Predicate<ReferentialReference<PersonDto>> newCaptainReferencePredicate() { return input -> input.getPropertyNames().contains(PersonDto.PROPERTY_CAPTAIN) - && Objects.equals(true, input.getPropertyValue(PersonDto.PROPERTY_CAPTAIN)); + && Objects.equals(true, input.getPropertyValue(PersonDto.PROPERTY_CAPTAIN)); } public static Predicate<ReferentialReference<PersonDto>> newDataEntryOperatorReferencePredicate() { return input -> input.getPropertyNames().contains(PersonDto.PROPERTY_DATA_ENTRY_OPERATOR) - && Objects.equals(true, input.getPropertyValue(PersonDto.PROPERTY_DATA_ENTRY_OPERATOR)); + && Objects.equals(true, input.getPropertyValue(PersonDto.PROPERTY_DATA_ENTRY_OPERATOR)); } public static Predicate<ReferentialReference<PersonDto>> newObserverReferencePredicate() { return input -> input.getPropertyNames().contains(PersonDto.PROPERTY_OBSERVER) - && Objects.equals(true, input.getPropertyValue(PersonDto.PROPERTY_OBSERVER)); + && Objects.equals(true, input.getPropertyValue(PersonDto.PROPERTY_OBSERVER)); } diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java b/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java index 654cf7a..dddd413 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java @@ -35,5 +35,6 @@ public class ProgramDto extends GeneratedProgramDto { } // Nécessaire pour les binders, mais non utilisé2 - public void setGearTypePrefix(String gearTypePrefix) {} + public void setGearTypePrefix(String gearTypePrefix) { + } } diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java index bcbff3e..32f88b8 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java @@ -40,7 +40,7 @@ public class WeightCategoryHelper extends GeneratedWeightCategoryHelper { * @param speciesId l'identifiant de l'espèce * @return la liste de toutes les catégories de poids de l'espèce */ - public static List<ReferentialReference<WeightCategoryDto>> filterSpeciesWeightCategories(Set<ReferentialReference<WeightCategoryDto>> weightCategoryReferences, String speciesId) { + public static List<ReferentialReference<WeightCategoryDto>> filterSpeciesWeightCategories(Set<ReferentialReference<WeightCategoryDto>> weightCategoryReferences, String speciesId) { List<ReferentialReference<WeightCategoryDto>> references = weightCategoryReferences.stream().filter(new WeightCategorySpeciesPredicate(speciesId)).collect(Collectors.toList()); diff --git a/services/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java b/services/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java index 541736e..a65ae62 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java @@ -29,5 +29,5 @@ public class GearUseFeaturesMeasurementSeineDto extends GeneratedGearUseFeatures public boolean isEmpty() { return gearCaracteristic == null || measurementValue == null; } - + } diff --git a/services/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java b/services/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java index 5c444d4..a347dfe 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java @@ -48,10 +48,10 @@ public class RouteDto extends GeneratedRouteDto { Date currentTime = DateUtil.getTime(time, false, false); return !getActivitySeine() - .stream() - .anyMatch(activity -> - Objects.equals(currentTime, activity.getTimeSecond()) - && ! Objects.equals(activitySeineId, activity.getId())); + .stream() + .anyMatch(activity -> + Objects.equals(currentTime, activity.getTimeSecond()) + && !Objects.equals(activitySeineId, activity.getId())); } public ActivitySeineStubDto getPreviousActivity(String activitySeineId) { @@ -69,7 +69,7 @@ public class RouteDto extends GeneratedRouteDto { if (previous != null) { if (log.isDebugEnabled()) { log.debug("previous activity " + - previous.getTime()); + previous.getTime()); } } else { if (log.isDebugEnabled()) { diff --git a/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateWithNoReferentialImportException.java b/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateWithNoReferentialImportException.java index 266807b..fdf5b36 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateWithNoReferentialImportException.java +++ b/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateWithNoReferentialImportException.java @@ -22,8 +22,6 @@ package fr.ird.observe.services.dto.source; * #L% */ -import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; - /** * Created on 23/08/15. * diff --git a/services/src/main/java/fr/ird/observe/services/dto/source/IncompatibleDataSourceCreateConfigurationException.java b/services/src/main/java/fr/ird/observe/services/dto/source/IncompatibleDataSourceCreateConfigurationException.java index 410117c..2976a5d 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/source/IncompatibleDataSourceCreateConfigurationException.java +++ b/services/src/main/java/fr/ird/observe/services/dto/source/IncompatibleDataSourceCreateConfigurationException.java @@ -22,8 +22,6 @@ package fr.ird.observe.services.dto.source; * #L% */ -import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; - /** * Created on 23/08/15. * diff --git a/services/src/main/java/fr/ird/observe/services/gson/FormAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/FormAdapter.java index 39d2a24..efc208b 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/FormAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/FormAdapter.java @@ -27,8 +27,8 @@ import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.form.Form; import java.lang.reflect.Type; diff --git a/services/src/main/java/fr/ird/observe/services/gson/ImmutableListAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ImmutableListAdapter.java index 125cdab..01dcccb 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/ImmutableListAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ImmutableListAdapter.java @@ -52,7 +52,8 @@ public class ImmutableListAdapter implements JsonDeserializer<ImmutableList<?>> } static <E> TypeToken<List<E>> listOf(TypeToken<E> subType) { - return new TypeToken<List<E>>() {} + return new TypeToken<List<E>>() { + } .where(new TypeParameter<E>() { }, subType); } diff --git a/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java b/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java index c213d78..b9f4eef 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java @@ -32,22 +32,22 @@ import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import fr.ird.observe.services.dto.ObserveBlobsContainer; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceList; import fr.ird.observe.services.dto.reference.DataReferenceSet; -import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.ObserveBlobsContainer; -import fr.ird.observe.services.service.actions.report.ReportVariable; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialMultimap; import fr.ird.observe.services.gson.reference.DataReferenceAdapter; import fr.ird.observe.services.gson.reference.DataReferenceListAdapter; import fr.ird.observe.services.gson.reference.DataReferenceSetAdapter; import fr.ird.observe.services.gson.reference.ReferentialReferenceAdapter; import fr.ird.observe.services.gson.reference.ReferentialReferenceSetAdapter; import fr.ird.observe.services.gson.reference.UnknownReferenceAdapter; -import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import fr.ird.observe.services.dto.reference.ReferentialReference; -import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.service.actions.report.ReportVariable; import org.nuiton.version.Version; import java.sql.Blob; @@ -79,15 +79,21 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { } public static <K, V> TypeToken<Map<K, V>> mapOf(TypeToken<K> keyType, TypeToken<V> valueType) { - return new TypeToken<Map<K, V>>() {} - .where(new TypeParameter<K>() {}, keyType) - .where(new TypeParameter<V>() {}, valueType); + return new TypeToken<Map<K, V>>() { + } + .where(new TypeParameter<K>() { + }, keyType) + .where(new TypeParameter<V>() { + }, valueType); } public static <K, V> TypeToken<Map<K, Collection<V>>> multimapOf(TypeToken<K> keyType, TypeToken<V> valueType) { - return new TypeToken<Map<K, Collection<V>>>() {} - .where(new TypeParameter<K>() {}, keyType) - .where(new TypeParameter<V>() {}, valueType); + return new TypeToken<Map<K, Collection<V>>>() { + } + .where(new TypeParameter<K>() { + }, keyType) + .where(new TypeParameter<V>() { + }, valueType); } @Override diff --git a/services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java index a4cb912..072b98c 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java @@ -76,7 +76,9 @@ public class ReferentialMultimapAdapter implements JsonSerializer<ReferentialMul } static <E> TypeToken<Collection<E>> collectionOf(Class<E> subType) { - return new TypeToken<Collection<E>>() {} - .where(new TypeParameter<E>() {}, subType); + return new TypeToken<Collection<E>>() { + } + .where(new TypeParameter<E>() { + }, subType); } } diff --git a/services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java index 4c46f9b..51c011f 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java @@ -30,9 +30,9 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.service.actions.report.ReportVariable; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.service.actions.report.ReportVariable; import java.lang.reflect.Type; import java.util.Set; diff --git a/services/src/main/java/fr/ird/observe/services/gson/reference/AbstractReferenceAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/AbstractReferenceAdapter.java index d638827..e099b85 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/reference/AbstractReferenceAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/AbstractReferenceAdapter.java @@ -30,8 +30,8 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import java.io.Serializable; diff --git a/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceAdapter.java index f66db99..dabebae 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceAdapter.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.gson.reference; * #L% */ +import fr.ird.observe.services.ObserveDataReferenceSets; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.ObserveDataReferenceSets; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import java.io.Serializable; diff --git a/services/src/main/java/fr/ird/observe/services/gson/reference/ReferenceCollectionSupportAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferenceCollectionSupportAdapter.java index dee2f0f..42783f7 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/reference/ReferenceCollectionSupportAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferenceCollectionSupportAdapter.java @@ -29,8 +29,8 @@ import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.reference.ReferenceCollectionSupport; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; diff --git a/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceAdapter.java index 1a7de3f..60a2ff3 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceAdapter.java @@ -26,10 +26,10 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.ObserveReferentialReferenceSets; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceSetAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceSetAdapter.java index 18063f9..23e8fde 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceSetAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceSetAdapter.java @@ -28,9 +28,9 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Date; diff --git a/services/src/main/java/fr/ird/observe/services/gson/reference/UnknownReferenceAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/UnknownReferenceAdapter.java index bb369b0..05f7b7c 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/reference/UnknownReferenceAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/UnknownReferenceAdapter.java @@ -27,11 +27,11 @@ import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.lang.reflect.Type; @@ -46,7 +46,7 @@ import java.lang.reflect.Type; * (AbstractReference étant une classe abstraite, elle n'est pas instanciable) * * @author smaisonneuve - * Created on 19/08/16. + * Created on 19/08/16. */ public class UnknownReferenceAdapter<D extends IdDto, R extends AbstractReference<D>> implements JsonDeserializer<R> { diff --git a/services/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java index 2a1bab9..36d4a89 100644 --- a/services/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java +++ b/services/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java @@ -27,7 +27,7 @@ package fr.ird.observe.services.security; * * @author Tony Chemit - dev@tchemit.fr */ -public class AdminApiKeyNotFoundException extends ObserveWebSecurityExceptionSupport{ +public class AdminApiKeyNotFoundException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; } diff --git a/services/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java index 859bdd1..f786eb1 100644 --- a/services/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java +++ b/services/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java @@ -27,7 +27,7 @@ package fr.ird.observe.services.security; * * @author Tony Chemit - dev@tchemit.fr */ -public class AuthenticationTokenNotFoundException extends ObserveWebSecurityExceptionSupport{ +public class AuthenticationTokenNotFoundException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; } diff --git a/services/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java index 1b4acde..1e6d680 100644 --- a/services/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java +++ b/services/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java @@ -27,7 +27,7 @@ package fr.ird.observe.services.security; * * @author Tony Chemit - dev@tchemit.fr */ -public class SecurityRequestContextNotFoundException extends ObserveWebSecurityExceptionSupport{ +public class SecurityRequestContextNotFoundException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; } diff --git a/services/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java index ad122b4..d5b23ba 100644 --- a/services/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java +++ b/services/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java @@ -27,7 +27,7 @@ package fr.ird.observe.services.security; * * @author Tony Chemit - dev@tchemit.fr */ -public class UserLoginNotFoundException extends ObserveWebSecurityExceptionSupport{ +public class UserLoginNotFoundException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; } diff --git a/services/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java b/services/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java index 8ad7d49..ef1b42b 100644 --- a/services/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java +++ b/services/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java @@ -27,7 +27,7 @@ package fr.ird.observe.services.security; * * @author Tony Chemit - dev@tchemit.fr */ -public class UserPasswordNotFoundException extends ObserveWebSecurityExceptionSupport{ +public class UserPasswordNotFoundException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; } diff --git a/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java b/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java index 7d3cb22..01f70c1 100644 --- a/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java +++ b/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java @@ -26,11 +26,11 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; +import fr.ird.observe.services.dto.ObserveDbUserDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.dto.ObserveDbUserDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.spi.NoDataAccess; import java.io.Closeable; diff --git a/services/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java b/services/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java index 1c202be..b83968b 100644 --- a/services/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java +++ b/services/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java @@ -38,6 +38,7 @@ public class DatabaseConnexionNotAuthorizedException extends Exception { public DatabaseConnexionNotAuthorizedException(ObserveDataSourceConfiguration dataSourceConfiguration) { this.dataSourceConfiguration = dataSourceConfiguration; } + public DatabaseConnexionNotAuthorizedException(String message, ObserveDataSourceConfiguration dataSourceConfiguration) { super(message); this.dataSourceConfiguration = dataSourceConfiguration; diff --git a/services/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java b/services/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java index 79957c5..a46fb34 100644 --- a/services/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java +++ b/services/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java @@ -38,6 +38,7 @@ public class DatabaseDestroyNotAuthorizedException extends Exception { public DatabaseDestroyNotAuthorizedException(ObserveDataSourceConfiguration dataSourceConfiguration) { this.dataSourceConfiguration = dataSourceConfiguration; } + public DatabaseDestroyNotAuthorizedException(String message, ObserveDataSourceConfiguration dataSourceConfiguration) { super(message); this.dataSourceConfiguration = dataSourceConfiguration; diff --git a/services/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java b/services/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java index ce9df6c..102d5ea 100644 --- a/services/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java +++ b/services/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java @@ -41,7 +41,7 @@ public class DatabaseNotFoundException extends Exception { this.dataSourceConfiguration = dataSourceConfiguration; } - public DatabaseNotFoundException(String message,ObserveDataSourceConfiguration dataSourceConfiguration) { + public DatabaseNotFoundException(String message, ObserveDataSourceConfiguration dataSourceConfiguration) { super(message); this.dataSourceConfiguration = dataSourceConfiguration; } diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java index 872364b..37f2132 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.actions.consolidate; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.common.constants.seine.SchoolType; +import fr.ird.observe.services.dto.ObserveDto; import java.io.Serializable; @@ -37,7 +37,7 @@ import java.io.Serializable; * * @author Tony Chemit - dev@tchemit.fr */ -public class ConsolidateActivitySeineDataResult implements Serializable,ObserveDto { +public class ConsolidateActivitySeineDataResult implements Serializable, ObserveDto { private static final long serialVersionUID = 1L; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java index 593e6ff..f125cc3 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java @@ -57,7 +57,7 @@ public class ConsolidateTripSeineDataResult implements Serializable, ObserveDto public ConsolidateTripSeineDataResult(String tripSeineId, String tripSeineLabel, ImmutableSet<ConsolidateActivitySeineDataResult> consolidateActivitySeineDataResults) { this.tripSeineId = tripSeineId; - this.tripSeineLabel=tripSeineLabel; + this.tripSeineLabel = tripSeineLabel; this.consolidateActivitySeineDataResults = consolidateActivitySeineDataResults; } diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/report/DataMatrix.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/DataMatrix.java index b8c9fa2..99f6310 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/report/DataMatrix.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/DataMatrix.java @@ -105,8 +105,8 @@ public class DataMatrix implements ObserveDto { if (log.isDebugEnabled()) { log.debug("copying incoming matrix (dim: " + - incoming.getDimension() + ", location: " + - incoming.getLocation() + ")"); + incoming.getDimension() + ", location: " + + incoming.getLocation() + ")"); } for (int i = 0; i < width; i++) { @@ -187,7 +187,7 @@ public class DataMatrix implements ObserveDto { if (rows != height) { if (log.isWarnEnabled()) { log.warn("No matching rows number : should have " + rows + - ", but was " + height); + ", but was " + height); } } } @@ -198,7 +198,7 @@ public class DataMatrix implements ObserveDto { if (columns != width) { if (log.isWarnEnabled()) { log.warn("No matching columns number : should have " + - columns + ", but was " + width); + columns + ", but was " + width); } } } diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java index 653cd68..338e339 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.services.service.actions.report; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.constants.ObserveModelType; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java index a19bdf7..4a39c1b 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java @@ -24,9 +24,9 @@ package fr.ird.observe.services.service.actions.synchro.referential.diff; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadReferentialPermission; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java index 0dd26f8..c76ec4e 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java @@ -24,9 +24,9 @@ package fr.ird.observe.services.service.actions.synchro.referential.diff; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import java.util.Set; import java.util.stream.Collectors; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java index 8f34e49..9d5cb48 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Collection; @@ -55,8 +55,8 @@ public class UnidirectionalReferentialSynchronizeCallbackRequest<R extends Refer } UnidirectionalReferentialSynchronizeCallbackRequest(Class<R> referentialName, - Collection<ReferentialReference<R>> referentialsToReplace, - Collection<ReferentialReference<R>> availableReferentials) { + Collection<ReferentialReference<R>> referentialsToReplace, + Collection<ReferentialReference<R>> availableReferentials) { this.referentialName = referentialName; this.referentialsToReplace = ImmutableSet.copyOf(referentialsToReplace); this.availableReferentials = ImmutableSet.copyOf(availableReferentials); diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java index f0bff02..90a912f 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java @@ -22,8 +22,8 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Collection; import java.util.HashMap; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java index a54749b..fc13da5 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackResult.java @@ -57,5 +57,4 @@ public class UnidirectionalReferentialSynchronizeCallbackResult<R extends Refere } - } diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java index 264fd49..39eca80 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java @@ -23,10 +23,10 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialHelper; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialHelper; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffState; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffs; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java index 12ef073..39b7208 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadReferentialPermission; import fr.ird.observe.services.spi.Write; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java index ab00ea1..a00f232 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.actions.validate; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDto; +import fr.ird.observe.services.dto.reference.AbstractReference; /** * Les résultats de la validation d'un dto. diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java index 939036b..53d84e7 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.actions.validate; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDto; +import fr.ird.observe.services.dto.reference.AbstractReference; /** * Le résultat d'une validation d'un type de dto donné. diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java index 6653e02..db53a6a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java @@ -64,9 +64,9 @@ public class ValidationMessage implements ObserveDto, Serializable { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("scope", scope) - .add("fieldName", fieldName) - .add("message", message) - .toString(); + .add("scope", scope) + .add("fieldName", fieldName) + .add("message", message) + .toString(); } } diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java index 0ace4a3..de83614 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java @@ -28,7 +28,7 @@ package fr.ird.observe.services.service.actions.validate; * @author Tony Chemit - dev@tchemit.fr */ public class ValidatorInitializationException extends RuntimeException { - private static final long serialVersionUID =1L; + private static final long serialVersionUID = 1L; public ValidatorInitializationException(Throwable cause) { super(cause); diff --git a/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java index b1bb3da..4c7301b 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.data; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.ObserveBlobsContainer; +import fr.ird.observe.services.dto.ObserveDto; /** * Created on 27/08/16. diff --git a/services/src/main/java/fr/ird/observe/services/service/data/ImportTripRequest.java b/services/src/main/java/fr/ird/observe/services/service/data/ImportTripRequest.java index 751be5b..2a8ef21 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/ImportTripRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ImportTripRequest.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.data; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.ObserveBlobsContainer; +import fr.ird.observe.services.dto.ObserveDto; /** * Created on 27/08/16. diff --git a/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java b/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java index 61fb8c9..a9ee44a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java @@ -25,11 +25,11 @@ package fr.ird.observe.services.service.data; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; /** diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java index a65bbcd..9c547ca 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java @@ -23,10 +23,10 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java index 6b07fbb..b0cf470 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java index 4a886e0..c1c7143 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java @@ -24,11 +24,11 @@ package fr.ird.observe.services.service.data.longline; import com.google.common.collect.ImmutableList; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.reference.DataReferenceList; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java index c754b7a..5f3399e 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java index 79d9341..235d524 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java index b7c7606..6b08bb7 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java index c15eb78..78d8333 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java index 0a2abc4..0cd672d 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java @@ -24,10 +24,10 @@ package fr.ird.observe.services.service.data.seine; import com.google.common.collect.ImmutableList; import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceList; -import fr.ird.observe.services.dto.form.Form; -import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -43,7 +43,7 @@ import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public interface TripSeineService extends ObserveService { +public interface TripSeineService extends ObserveService { @ReadDataPermission DataReferenceList<TripSeineDto> getAllTripSeine(); diff --git a/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java b/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java index 8e9d93c..90dee33 100644 --- a/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java @@ -24,11 +24,11 @@ package fr.ird.observe.services.service.referential; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.dto.form.FormRequestDefinition; import fr.ird.observe.services.ObserveFormRequests; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.form.FormRequestDefinition; +import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java index 0c9cdc2..ae2a109 100644 --- a/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java @@ -27,9 +27,9 @@ import com.google.common.collect.SetMultimap; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferenceMap; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; @@ -100,7 +100,7 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission @PostRequest - SetMultimap<Class<? extends ReferentialDto>,String> getReferentialIds(); + SetMultimap<Class<? extends ReferentialDto>, String> getReferentialIds(); @ReadReferentialPermission diff --git a/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java b/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java index 89e5030..7aacb65 100644 --- a/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java @@ -35,6 +35,7 @@ public class AddSqlScriptProducerResult { private final byte[] sqlCode; private final ImmutableSet<ObserveBlobsContainer> blobsContainers; + public AddSqlScriptProducerResult(byte[] sqlCode, ImmutableSet<ObserveBlobsContainer> blobsContainers) { this.sqlCode = sqlCode; this.blobsContainers = blobsContainers; diff --git a/services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java b/services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java index c3949be..c44e0ef 100644 --- a/services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java @@ -74,8 +74,8 @@ public class DeleteSqlScriptProducerRequest { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("deleteData", deleteData) - .add("dataIds", dataIds == null ? "" : "[" + dataIds.stream().collect(Collectors.joining(", ")) + "]") - .toString(); + .add("deleteData", deleteData) + .add("dataIds", dataIds == null ? "" : "[" + dataIds.stream().collect(Collectors.joining(", ")) + "]") + .toString(); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm