branch develop updated (d6aa58a -> 1d38965)
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 d6aa58a Use last stable of ToPIA new 1d38965 Use new bean transformer 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 1d38965986d6a5a0707375303b8a73739a179ef2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 18 11:28:31 2016 +0200 Use new bean transformer Summary of changes: .../SetLonglineUniqueHomeIdDtoValidator.java | 6 ++--- .../SetLonglineUniqueNumberDtoValidator.java | 4 ++-- .../application/swing/ObserveOpenDataManager.java | 20 ++++++++-------- .../observe/application/swing/db/DataContext.java | 20 ++++++++-------- .../application/swing/ui/admin/AdminUIModel.java | 4 ++-- .../validate/ValidateEntityListCellRenderer.java | 6 ++--- .../swing/ui/admin/validate/ValidateModel.java | 11 ++++----- .../swing/ui/admin/validate/ValidateUIHandler.java | 10 ++++---- .../swing/ui/content/ContentUIManager.java | 8 +++---- .../content/impl/longline/BranchlineUIHandler.java | 6 ++--- .../LonglineDetailCompositionUIHandler.java | 12 +++++----- .../LonglineGlobalCompositionUIHandler.java | 12 +++++----- .../impl/longline/SetLonglineUIHandler.java | 4 ++-- .../ActivitySeineObservedSystemUIHandler.java | 4 ++-- ...ngObjectTransmittingBuoyOperationUIHandler.java | 14 +++++------ .../impl/seine/FloatingObjectUIHandler.java | 4 ++-- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 ++-- .../impl/longline/ActivityLonglineUIHandler.java | 4 ++-- .../impl/longline/ActivityLonglineUIModel.java | 8 +++---- .../content/open/impl/longline/TripLonglineUI.jaxx | 4 ++-- .../open/impl/longline/TripLonglineUIHandler.java | 16 ++++++------- .../open/impl/seine/ActivitySeineUIHandler.java | 4 ++-- .../open/impl/seine/ActivitySeineUIModel.java | 14 +++++------ .../ui/content/open/impl/seine/RouteUIHandler.java | 4 ++-- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 4 ++-- .../open/impl/seine/TripSeineUIHandler.java | 16 ++++++------- .../impl/GearUseFeatureMeasurementCellEditor.java | 4 ++-- .../GearUseFeatureMeasurementCellRenderer.java | 4 ++-- .../impl/longline/BaitsCompositionUIModel.java | 4 ++-- .../longline/BranchlinesCompositionUIModel.java | 4 ++-- .../impl/longline/CatchLonglineTableModel.java | 4 ++-- .../impl/longline/CatchLonglineUIHandler.java | 8 +++---- .../table/impl/longline/EncounterUIHandler.java | 4 ++-- .../table/impl/longline/EncounterUIModel.java | 4 ++-- .../longline/FloatlinesCompositionUIModel.java | 4 ++-- .../GearUseFeaturesLonglineTableModel.java | 4 ++-- .../longline/GearUseFeaturesLonglineUIHandler.java | 8 +++---- ...rUseFeaturesMeasurementLonglinesTableModel.java | 4 ++-- .../impl/longline/HooksCompositionUIModel.java | 4 ++-- .../table/impl/longline/SensorUsedUIHandler.java | 4 ++-- .../table/impl/longline/SensorUsedUIModel.java | 4 ++-- .../content/table/impl/longline/TdrUIHandler.java | 4 ++-- .../ui/content/table/impl/longline/TdrUIModel.java | 4 ++-- ...GearUseFeaturesMeasurementSeinesTableModel.java | 4 ++-- .../impl/seine/GearUseFeaturesSeineTableModel.java | 4 ++-- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 8 +++---- .../table/impl/seine/NonTargetCatchUIHandler.java | 8 +++---- .../table/impl/seine/NonTargetCatchUIModel.java | 4 ++-- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 ++-- .../table/impl/seine/NonTargetSampleUIModel.java | 4 ++-- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 4 ++-- .../impl/seine/ObjectObservedSpeciesUIModel.java | 4 ++-- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 ++-- .../impl/seine/ObjectSchoolEstimateUIModel.java | 4 ++-- .../table/impl/seine/SchoolEstimateUIHandler.java | 4 ++-- .../table/impl/seine/SchoolEstimateUIModel.java | 4 ++-- .../table/impl/seine/TargetCatchUIHandler.java | 12 +++++----- .../table/impl/seine/TargetCatchUIModel.java | 4 ++-- .../impl/seine/TargetDiscardCatchUIHandler.java | 12 +++++----- .../impl/seine/TargetDiscardCatchUIModel.java | 4 ++-- .../table/impl/seine/TargetSampleUIHandler.java | 4 ++-- .../table/impl/seine/TargetSampleUIModel.java | 4 ++-- .../swing/ui/storage/tabs/DataSelectionModel.java | 28 +++++++++++----------- .../swing/ui/storage/tabs/RolesTableModel.java | 4 ++-- .../swing/ui/storage/tabs/SecurityModel.java | 14 +++++------ .../actions/ChangeTripProgramActionListener.java | 4 ++-- .../ui/tree/loadors/ReferenceNodeChildLoador.java | 8 +++---- .../MoveActivityLonglineNodeMenuPopulator.java | 4 ++-- .../menu/MoveActivitySeineNodeMenuPopulator.java | 4 ++-- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 4 ++-- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 6 ++--- .../swing/ui/util/tripMap/TripMapUIHandler.java | 6 ++--- pom.xml | 2 +- services-dto/pom.xml | 2 +- .../fr/ird/observe/services/dto/DataReference.java | 4 ++-- .../java/fr/ird/observe/services/dto/IdDto.java | 6 ++--- .../services/dto/{IdDtos.java => IdHelper.java} | 4 ++-- ...rveDbUserDtos.java => ObserveDbUserHelper.java} | 2 +- .../services/dto/constants/ReferentialLocale.java | 4 ++-- .../services/dto/longline/ActivityLonglineDto.java | 2 +- .../GearUseFeaturesMeasurementLonglineDto.java | 2 +- ...mplates.java => SectionWithTemplateHelper.java} | 2 +- .../longline/SetLonglineGlobalCompositionDto.java | 2 +- ...eDtos.java => GearCaracteristicTypeHelper.java} | 2 +- .../dto/referential/I18nReferentialDto.java | 2 +- ...rentialDtos.java => I18nReferentialHelper.java} | 3 +-- .../{PersonDtos.java => PersonHelper.java} | 2 +- .../services/dto/referential/ProgramDto.java | 2 +- .../{ProgramDtos.java => ProgramHelper.java} | 2 +- .../services/dto/referential/ReferentialDto.java | 2 +- ...ReferentialDtos.java => ReferentialHelper.java} | 2 +- .../services/dto/referential/SpeciesListDto.java | 2 +- .../{VesselDtos.java => VesselHelper.java} | 2 +- ...Dtos.java => VesselActivityLonglineHelper.java} | 4 ++-- ...ineDtos.java => VesselActivitySeineHelper.java} | 4 ++-- ...CategoryDtos.java => WeightCategoryHelper.java} | 4 ++-- .../observe/services/dto/result/SaveResultDto.java | 2 +- .../{SaveResultDtos.java => SaveResultHelper.java} | 2 +- ...ultDtos.java => TripChildSaveResultHelper.java} | 2 +- .../services/dto/seine/ActivitySeineDto.java | 2 +- .../services/dto/seine/ActivitySeineStubDto.java | 2 +- .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 8 +++---- .../observe/services/dto/seine/SetSeineDto.java | 2 +- ...TargetCatchDtos.java => TargetCatchHelper.java} | 4 ++-- .../services/dto/seine/TargetLengthDto.java | 2 +- .../observe/services/dto/seine/TripSeineDto.java | 10 ++++---- services-dto/src/main/xmi/observe-services-dto.ini | 7 +++--- .../seine/TripSeineGearUseServiceRestTest.java | 28 +++++++++++----------- .../services/topia/ObserveSecurityHelper.java | 6 ++--- .../services/topia/ObserveServiceTopia.java | 6 ++--- .../services/topia/binder/BinderSupport.java | 4 ++-- .../topia/binder/data/TripLonglineBinder.java | 4 ++-- .../topia/binder/data/TripSeineBinder.java | 4 ++-- .../topia/service/DataSourceServiceTopia.java | 4 ++-- .../topia/service/TripManagementServiceTopia.java | 4 ++-- .../longline/ActivityLonglineServiceTopia.java | 4 ++-- .../topia/service/seine/RouteServiceTopia.java | 4 ++-- .../service/seine/TargetCatchServiceTopia.java | 6 ++--- .../seine/TripSeineGearUseServiceTopiaTest.java | 6 ++--- ...orDtos.java => ValidateResultForDtoHelper.java} | 2 +- .../{ValidatorDtos.java => ValidatorHelper.java} | 2 +- 123 files changed, 337 insertions(+), 340 deletions(-) rename services-dto/src/main/java/fr/ird/observe/services/dto/{IdDtos.java => IdHelper.java} (98%) rename services-dto/src/main/java/fr/ird/observe/services/dto/{ObserveDbUserDtos.java => ObserveDbUserHelper.java} (94%) rename services-dto/src/main/java/fr/ird/observe/services/dto/longline/{SectionWithTemplates.java => SectionWithTemplateHelper.java} (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{GearCaracteristicTypeDtos.java => GearCaracteristicTypeHelper.java} (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{I18nReferentialDtos.java => I18nReferentialHelper.java} (95%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{PersonDtos.java => PersonHelper.java} (98%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{ProgramDtos.java => ProgramHelper.java} (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{ReferentialDtos.java => ReferentialHelper.java} (98%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/{VesselDtos.java => VesselHelper.java} (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/{VesselActivityLonglineDtos.java => VesselActivityLonglineHelper.java} (92%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/{VesselActivitySeineDtos.java => VesselActivitySeineHelper.java} (95%) rename services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/{WeightCategoryDtos.java => WeightCategoryHelper.java} (96%) rename services-dto/src/main/java/fr/ird/observe/services/dto/result/{SaveResultDtos.java => SaveResultHelper.java} (94%) rename services-dto/src/main/java/fr/ird/observe/services/dto/result/{TripChildSaveResultDtos.java => TripChildSaveResultHelper.java} (92%) rename services-dto/src/main/java/fr/ird/observe/services/dto/seine/{TargetCatchDtos.java => TargetCatchHelper.java} (94%) rename services/src/main/java/fr/ird/observe/services/service/actions/validate/{ValidateResultForDtos.java => ValidateResultForDtoHelper.java} (98%) rename services/src/main/java/fr/ird/observe/services/service/actions/validate/{ValidatorDtos.java => ValidatorHelper.java} (98%) -- 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 1d38965986d6a5a0707375303b8a73739a179ef2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 18 11:28:31 2016 +0200 Use new bean transformer --- .../SetLonglineUniqueHomeIdDtoValidator.java | 6 ++--- .../SetLonglineUniqueNumberDtoValidator.java | 4 ++-- .../application/swing/ObserveOpenDataManager.java | 20 ++++++++-------- .../observe/application/swing/db/DataContext.java | 20 ++++++++-------- .../application/swing/ui/admin/AdminUIModel.java | 4 ++-- .../validate/ValidateEntityListCellRenderer.java | 6 ++--- .../swing/ui/admin/validate/ValidateModel.java | 11 ++++----- .../swing/ui/admin/validate/ValidateUIHandler.java | 10 ++++---- .../swing/ui/content/ContentUIManager.java | 8 +++---- .../content/impl/longline/BranchlineUIHandler.java | 6 ++--- .../LonglineDetailCompositionUIHandler.java | 12 +++++----- .../LonglineGlobalCompositionUIHandler.java | 12 +++++----- .../impl/longline/SetLonglineUIHandler.java | 4 ++-- .../ActivitySeineObservedSystemUIHandler.java | 4 ++-- ...ngObjectTransmittingBuoyOperationUIHandler.java | 14 +++++------ .../impl/seine/FloatingObjectUIHandler.java | 4 ++-- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 ++-- .../impl/longline/ActivityLonglineUIHandler.java | 4 ++-- .../impl/longline/ActivityLonglineUIModel.java | 8 +++---- .../content/open/impl/longline/TripLonglineUI.jaxx | 4 ++-- .../open/impl/longline/TripLonglineUIHandler.java | 16 ++++++------- .../open/impl/seine/ActivitySeineUIHandler.java | 4 ++-- .../open/impl/seine/ActivitySeineUIModel.java | 14 +++++------ .../ui/content/open/impl/seine/RouteUIHandler.java | 4 ++-- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 4 ++-- .../open/impl/seine/TripSeineUIHandler.java | 16 ++++++------- .../impl/GearUseFeatureMeasurementCellEditor.java | 4 ++-- .../GearUseFeatureMeasurementCellRenderer.java | 4 ++-- .../impl/longline/BaitsCompositionUIModel.java | 4 ++-- .../longline/BranchlinesCompositionUIModel.java | 4 ++-- .../impl/longline/CatchLonglineTableModel.java | 4 ++-- .../impl/longline/CatchLonglineUIHandler.java | 8 +++---- .../table/impl/longline/EncounterUIHandler.java | 4 ++-- .../table/impl/longline/EncounterUIModel.java | 4 ++-- .../longline/FloatlinesCompositionUIModel.java | 4 ++-- .../GearUseFeaturesLonglineTableModel.java | 4 ++-- .../longline/GearUseFeaturesLonglineUIHandler.java | 8 +++---- ...rUseFeaturesMeasurementLonglinesTableModel.java | 4 ++-- .../impl/longline/HooksCompositionUIModel.java | 4 ++-- .../table/impl/longline/SensorUsedUIHandler.java | 4 ++-- .../table/impl/longline/SensorUsedUIModel.java | 4 ++-- .../content/table/impl/longline/TdrUIHandler.java | 4 ++-- .../ui/content/table/impl/longline/TdrUIModel.java | 4 ++-- ...GearUseFeaturesMeasurementSeinesTableModel.java | 4 ++-- .../impl/seine/GearUseFeaturesSeineTableModel.java | 4 ++-- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 8 +++---- .../table/impl/seine/NonTargetCatchUIHandler.java | 8 +++---- .../table/impl/seine/NonTargetCatchUIModel.java | 4 ++-- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 ++-- .../table/impl/seine/NonTargetSampleUIModel.java | 4 ++-- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 4 ++-- .../impl/seine/ObjectObservedSpeciesUIModel.java | 4 ++-- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 ++-- .../impl/seine/ObjectSchoolEstimateUIModel.java | 4 ++-- .../table/impl/seine/SchoolEstimateUIHandler.java | 4 ++-- .../table/impl/seine/SchoolEstimateUIModel.java | 4 ++-- .../table/impl/seine/TargetCatchUIHandler.java | 12 +++++----- .../table/impl/seine/TargetCatchUIModel.java | 4 ++-- .../impl/seine/TargetDiscardCatchUIHandler.java | 12 +++++----- .../impl/seine/TargetDiscardCatchUIModel.java | 4 ++-- .../table/impl/seine/TargetSampleUIHandler.java | 4 ++-- .../table/impl/seine/TargetSampleUIModel.java | 4 ++-- .../swing/ui/storage/tabs/DataSelectionModel.java | 28 +++++++++++----------- .../swing/ui/storage/tabs/RolesTableModel.java | 4 ++-- .../swing/ui/storage/tabs/SecurityModel.java | 14 +++++------ .../actions/ChangeTripProgramActionListener.java | 4 ++-- .../ui/tree/loadors/ReferenceNodeChildLoador.java | 8 +++---- .../MoveActivityLonglineNodeMenuPopulator.java | 4 ++-- .../menu/MoveActivitySeineNodeMenuPopulator.java | 4 ++-- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 4 ++-- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 6 ++--- .../swing/ui/util/tripMap/TripMapUIHandler.java | 6 ++--- pom.xml | 2 +- services-dto/pom.xml | 2 +- .../fr/ird/observe/services/dto/DataReference.java | 4 ++-- .../java/fr/ird/observe/services/dto/IdDto.java | 6 ++--- .../services/dto/{IdDtos.java => IdHelper.java} | 4 ++-- ...rveDbUserDtos.java => ObserveDbUserHelper.java} | 2 +- .../services/dto/constants/ReferentialLocale.java | 4 ++-- .../services/dto/longline/ActivityLonglineDto.java | 2 +- .../GearUseFeaturesMeasurementLonglineDto.java | 2 +- ...mplates.java => SectionWithTemplateHelper.java} | 2 +- .../longline/SetLonglineGlobalCompositionDto.java | 2 +- ...eDtos.java => GearCaracteristicTypeHelper.java} | 2 +- .../dto/referential/I18nReferentialDto.java | 2 +- ...rentialDtos.java => I18nReferentialHelper.java} | 3 +-- .../{PersonDtos.java => PersonHelper.java} | 2 +- .../services/dto/referential/ProgramDto.java | 2 +- .../{ProgramDtos.java => ProgramHelper.java} | 2 +- .../services/dto/referential/ReferentialDto.java | 2 +- ...ReferentialDtos.java => ReferentialHelper.java} | 2 +- .../services/dto/referential/SpeciesListDto.java | 2 +- .../{VesselDtos.java => VesselHelper.java} | 2 +- ...Dtos.java => VesselActivityLonglineHelper.java} | 4 ++-- ...ineDtos.java => VesselActivitySeineHelper.java} | 4 ++-- ...CategoryDtos.java => WeightCategoryHelper.java} | 4 ++-- .../observe/services/dto/result/SaveResultDto.java | 2 +- .../{SaveResultDtos.java => SaveResultHelper.java} | 2 +- ...ultDtos.java => TripChildSaveResultHelper.java} | 2 +- .../services/dto/seine/ActivitySeineDto.java | 2 +- .../services/dto/seine/ActivitySeineStubDto.java | 2 +- .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 8 +++---- .../observe/services/dto/seine/SetSeineDto.java | 2 +- ...TargetCatchDtos.java => TargetCatchHelper.java} | 4 ++-- .../services/dto/seine/TargetLengthDto.java | 2 +- .../observe/services/dto/seine/TripSeineDto.java | 10 ++++---- services-dto/src/main/xmi/observe-services-dto.ini | 7 +++--- .../seine/TripSeineGearUseServiceRestTest.java | 28 +++++++++++----------- .../services/topia/ObserveSecurityHelper.java | 6 ++--- .../services/topia/ObserveServiceTopia.java | 6 ++--- .../services/topia/binder/BinderSupport.java | 4 ++-- .../topia/binder/data/TripLonglineBinder.java | 4 ++-- .../topia/binder/data/TripSeineBinder.java | 4 ++-- .../topia/service/DataSourceServiceTopia.java | 4 ++-- .../topia/service/TripManagementServiceTopia.java | 4 ++-- .../longline/ActivityLonglineServiceTopia.java | 4 ++-- .../topia/service/seine/RouteServiceTopia.java | 4 ++-- .../service/seine/TargetCatchServiceTopia.java | 6 ++--- .../seine/TripSeineGearUseServiceTopiaTest.java | 6 ++--- ...orDtos.java => ValidateResultForDtoHelper.java} | 2 +- .../{ValidatorDtos.java => ValidatorHelper.java} | 2 +- 123 files changed, 337 insertions(+), 340 deletions(-) diff --git a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java index 60e3deb..f36e58b 100644 --- a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java @@ -30,7 +30,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; -import fr.ird.observe.services.dto.longline.SetLonglineStubDtos; +import fr.ird.observe.services.dto.longline.SetLonglineStubHelper; import java.util.Optional; @@ -52,10 +52,10 @@ public class SetLonglineUniqueHomeIdDtoValidator extends FieldValidatorSupport { Optional<SetLonglineStubDto> sameHomeIdSetLonglineOptional = setLongline.getOtherSets() .stream() - .filter(SetLonglineStubDtos.newHomeIdPredicate(homeId)) + .filter(SetLonglineStubHelper.newHomeIdPredicate(homeId)) .findFirst(); -// Iterables.tryFind(setLongline.getOtherSets(), SetLonglineStubDtos.newHomeIdPredicate(homeId)::test); +// Iterables.tryFind(setLongline.getOtherSets(), SetLonglineStubHelper.newHomeIdPredicate(homeId)::test); if (sameHomeIdSetLonglineOptional.isPresent()) { diff --git a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java index ca97559..6dbb6bb 100644 --- a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java @@ -30,7 +30,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; -import fr.ird.observe.services.dto.longline.SetLonglineStubDtos; +import fr.ird.observe.services.dto.longline.SetLonglineStubHelper; import java.util.Optional; @@ -52,7 +52,7 @@ public class SetLonglineUniqueNumberDtoValidator extends FieldValidatorSupport { Optional<SetLonglineStubDto> sameNumberSetLonglineOptional = setLongline.getOtherSets() .stream() - .filter(SetLonglineStubDtos.newNumberPredicate(number)) + .filter(SetLonglineStubHelper.newNumberPredicate(number)) .findFirst(); if (sameNumberSetLonglineOptional.isPresent()) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java index b027c7f..1a64cbe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing; import com.google.common.base.Preconditions; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.services.ObserveServicesProvider; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.referential.ProgramDto; import java.io.Closeable; @@ -238,39 +238,39 @@ public class ObserveOpenDataManager implements Closeable { // si l'id précédent existe, on vérifie l'actuel // sinon, on met à null if (exists) { - if (IdDtos.isProgramId(id)) { + if (IdHelper.isProgramId(id)) { exists = servicesProvider.newReferentialService().exists(ProgramDto.class, id); - } else if (IdDtos.isTripSeineId(id)) { + } else if (IdHelper.isTripSeineId(id)) { exists = servicesProvider.newTripSeineService().exists(id); - } else if (IdDtos.isRouteId(id)) { + } else if (IdHelper.isRouteId(id)) { exists = servicesProvider.newRouteService().exists(id); - } else if (IdDtos.isActivitySeineId(id)) { + } else if (IdHelper.isActivitySeineId(id)) { exists = servicesProvider.newActivitySeineService().exists(id); - } else if (IdDtos.isSetSeineId(id)) { + } else if (IdHelper.isSetSeineId(id)) { exists = servicesProvider.newSetSeineService().exists(id); - } else if (IdDtos.isFloatingObjectId(id)) { + } else if (IdHelper.isFloatingObjectId(id)) { exists = servicesProvider.newFloatingObjectService().exists(id); - } else if (IdDtos.isTripLonglineId(id)) { + } else if (IdHelper.isTripLonglineId(id)) { exists = servicesProvider.newTripLonglineService().exists(id); - } else if (IdDtos.isActivityLonglineId(id)) { + } else if (IdHelper.isActivityLonglineId(id)) { exists = servicesProvider.newActivityLonglineService().exists(id); - } else if (IdDtos.isSetLonglineId(id)) { + } else if (IdHelper.isSetLonglineId(id)) { exists = servicesProvider.newSetLonglineService().exists(id); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/DataContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/DataContext.java index 920af7a..dd4e7de 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/DataContext.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/DataContext.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.db; */ import fr.ird.observe.application.swing.db.constants.DataContextType; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -297,11 +297,11 @@ public class DataContext extends AbstractSerializableBean { } public boolean isSelectedTripLongline() { - return selectedTripId != null && IdDtos.isLonglineId(selectedTripId); + return selectedTripId != null && IdHelper.isLonglineId(selectedTripId); } public boolean isSelectedTripSeine() { - return selectedTripId != null && IdDtos.isSeineId(selectedTripId); + return selectedTripId != null && IdHelper.isSeineId(selectedTripId); } public String getSelectedRouteId() { @@ -327,11 +327,11 @@ public class DataContext extends AbstractSerializableBean { } public boolean isSelectedActivityLongline() { - return selectedActivityId != null && IdDtos.isLonglineId(selectedActivityId); + return selectedActivityId != null && IdHelper.isLonglineId(selectedActivityId); } public boolean isSelectedActivitySeine() { - return selectedActivityId != null && IdDtos.isSeineId(selectedActivityId); + return selectedActivityId != null && IdHelper.isSeineId(selectedActivityId); } public void setSelectedActivityId(String selectedActivityId) { @@ -481,10 +481,10 @@ public class DataContext extends AbstractSerializableBean { String tripId = getOpenTripId(); ids.add(tripId); - if (IdDtos.isTripSeineId(tripId)) { + if (IdHelper.isTripSeineId(tripId)) { // on a seine trip - if (!IdDtos.isTripClass(type) && isOpenRoute()) { + if (!IdHelper.isTripClass(type) && isOpenRoute()) { ids.add(getOpenRouteId()); @@ -492,7 +492,7 @@ public class DataContext extends AbstractSerializableBean { ids.add(getOpenActivitySeineId()); - if (!IdDtos.isActivityClass(type) && isOpenSetSeine()) { + if (!IdHelper.isActivityClass(type) && isOpenSetSeine()) { ids.add(getOpenSetSeineId()); } } @@ -501,11 +501,11 @@ public class DataContext extends AbstractSerializableBean { } else { // on a longline trip - if (!IdDtos.isTripClass(type) && isOpenActivityLongline()) { + if (!IdHelper.isTripClass(type) && isOpenActivityLongline()) { ids.add(getOpenActivityLonglineId()); - if (!IdDtos.isActivityClass(type) && isOpenSetLongline()) { + if (!IdHelper.isActivityClass(type) && isOpenSetLongline()) { ids.add(getOpenSetLonglineId()); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java index 86d0c31..c4898de 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java @@ -45,7 +45,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.actions.report.Report; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -451,7 +451,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { return null; } DataReference dto = data.iterator().next(); - if (IdDtos.isTrip(dto)) { + if (IdHelper.isTrip(dto)) { return dto; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java index d476cf3..1e3d79f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; -import fr.ird.observe.services.service.actions.validate.ValidateResultForDtos; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -61,7 +61,7 @@ public class ValidateEntityListCellRenderer extends DefaultListCellRenderer impl public ValidateEntityListCellRenderer(ValidateModel model) { this.model = model; renderCache = new HashMap<>(); - // on ecoute les modifications de messages sur le model + // on écoute les modifications de messages sur le model this.model.addPropertyChangeListener(ValidateModel.PROPERTY_MESSAGES, this); } @@ -125,7 +125,7 @@ public class ValidateEntityListCellRenderer extends DefaultListCellRenderer impl ValidateResultForDto validateResultForDto = model.getMessages(value); EnumMap<NuitonValidatorScope, Integer> scopes = - ValidateResultForDtos.getScopesCount(validateResultForDto); + ValidateResultForDtoHelper.getScopesCount(validateResultForDto); StringBuilder buffer = new StringBuilder(); 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 27135ca..d92b3fa 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 @@ -24,16 +24,15 @@ package fr.ird.observe.application.swing.ui.admin.validate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.application.swing.ui.admin.AdminActionModel; +import fr.ird.observe.application.swing.ui.admin.AdminStep; +import fr.ird.observe.application.swing.validation.ValidationModelMode; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; 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.ValidatorDto; -import fr.ird.observe.services.service.actions.validate.ValidatorDtos; -import fr.ird.observe.application.swing.ui.admin.AdminActionModel; -import fr.ird.observe.application.swing.ui.admin.AdminStep; -import fr.ird.observe.application.swing.validation.ValidationModelMode; +import fr.ird.observe.services.service.actions.validate.ValidatorHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -164,7 +163,7 @@ public class ValidateModel extends AdminActionModel { public Set<ValidatorDto> getValidators() { if (validators == null) { if (allValidators != null && getContextName() != null) { - validators = ValidatorDtos.filter( + validators = ValidatorHelper.filter( allValidators, getModelMode().isData(), getModelMode().isReferential(), 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 d79ce6e..486c18f 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 @@ -51,7 +51,7 @@ import fr.ird.observe.services.service.actions.validate.ValidateReferentialsRequ import fr.ird.observe.services.service.actions.validate.ValidateReferentialsResult; 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.ValidateResultForDtos; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoHelper; import fr.ird.observe.services.service.actions.validate.ValidateService; import fr.ird.observe.services.service.actions.validate.ValidationMessage; import fr.ird.observe.services.service.actions.validate.ValidatorDto; @@ -493,20 +493,20 @@ public class ValidateUIHandler extends AdminTabUIHandler { for (ValidateResultForDtoType validateResultForDtoType : messages.values()) { - ImmutableSet<ValidateResultForDto> validateResultForDtos = validateResultForDtoType.getValidateResultForDto(); - for (ValidateResultForDto validateResultForDto : validateResultForDtos) { + ImmutableSet<ValidateResultForDto> validateResultForHelper = validateResultForDtoType.getValidateResultForDto(); + for (ValidateResultForDto validateResultForDto : validateResultForHelper) { AbstractReference referenceDto = validateResultForDto.getDto(); String refStr = service.getReferenceDecorator(referenceDto.getType()).toString(referenceDto); Set<ValidationMessage> refMessages = validateResultForDto.getMessages(); - EnumSet<NuitonValidatorScope> scopes = ValidateResultForDtos.getScopes(validateResultForDto); + EnumSet<NuitonValidatorScope> scopes = ValidateResultForDtoHelper.getScopes(validateResultForDto); builder.append(t("observe.actions.validate.report.entity", referenceDto.getId(), refStr, refMessages.size(), scopes)).append('\n'); for (NuitonValidatorScope scope : scopes) { - List<ValidationMessage> messagesByScope = ValidateResultForDtos.scopeMessageFilter(scope, validateResultForDto); + List<ValidationMessage> messagesByScope = ValidateResultForDtoHelper.scopeMessageFilter(scope, validateResultForDto); for (ValidationMessage message : messagesByScope) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java index af4858c..f327cb6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java @@ -73,7 +73,7 @@ import fr.ird.observe.services.dto.longline.TdrDto; 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.referential.ReferentialDtos; +import fr.ird.observe.services.dto.referential.ReferentialHelper; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -185,9 +185,9 @@ public class ContentUIManager { // --- Referential --- // - loadReferentialsMapping(ReferentialDtos.REFERENCE_COMMON_DTOS, "impl"); - loadReferentialsMapping(ReferentialDtos.REFERENCE_SEINE_DTOS, "impl.seine"); - loadReferentialsMapping(ReferentialDtos.REFERENCE_LONGLINE_DTOS, "impl.longline"); + loadReferentialsMapping(ReferentialHelper.REFERENCE_COMMON_DTOS, "impl"); + loadReferentialsMapping(ReferentialHelper.REFERENCE_SEINE_DTOS, "impl.seine"); + loadReferentialsMapping(ReferentialHelper.REFERENCE_LONGLINE_DTOS, "impl.longline"); addMapping(REFERENCE, null, null, ReferenceHomeUI.class); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java index e6e84bd..bc4c6e0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.BranchlineDtos; +import fr.ird.observe.services.dto.longline.BranchlineHelper; 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; @@ -77,7 +77,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { } getModel().setBranchline(branchline); - BranchlineDtos.copyBranchlineDto(branchline, getBean()); + BranchlineHelper.copyBranchlineDto(branchline, getBean()); if (branchline == null) { @@ -216,7 +216,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { // bind back to model branchline BranchlineDto beanToSave = getModel().getBranchline(); - BranchlineDtos.copyBranchlineDto(bean, beanToSave); + BranchlineHelper.copyBranchlineDto(bean, beanToSave); // for external models getModel().fireSaved(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index fd21e26..3b8ca5e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -34,9 +34,9 @@ import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SectionTemplate; import fr.ird.observe.services.dto.longline.SectionWithTemplate; -import fr.ird.observe.services.dto.longline.SectionWithTemplates; +import fr.ird.observe.services.dto.longline.SectionWithTemplateHelper; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDtos; +import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; import fr.ird.observe.application.swing.ui.ObserveMainUI; @@ -363,7 +363,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong getModel().setForm(setLonglineDtoForm); SetLonglineDetailCompositionDto bean = getBean(); - SetLonglineDetailCompositionDtos.copySetLonglineDetailCompositionDto(setLonglineDtoForm.getObject(), bean); + SetLonglineDetailCompositionHelper.copySetLonglineDetailCompositionDto(setLonglineDtoForm.getObject(), bean); //FIXME Voir comment gérer ça Form<BranchlineDto> branchlineDtoForm = Form.newFormDto(BranchlineDto.class, null, null, null); @@ -392,7 +392,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong try { - List<SectionWithTemplate> section = SectionWithTemplates.getSectionTemplates(bean.getSection()); + List<SectionWithTemplate> section = SectionWithTemplateHelper.getSectionTemplates(bean.getSection()); getSectionsTableModel().setData(section); validationHelper.setObjectValueAdjusting(true); @@ -563,11 +563,11 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong sectionsTableModel.rearrangeIds(sections); sectionsTableModel.setData(sections); - List<SectionDto> sectionDtos = sections.stream() + List<SectionDto> sectionHelper = sections.stream() .map(SectionWithTemplate::getDelegate) .collect(Collectors.toList()); - getBean().addAllSection(sectionDtos); + getBean().addAllSection(sectionHelper); getModel().setModified(true); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index aa7f385..b1159ea 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDtos; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; import fr.ird.observe.application.swing.ui.content.ContentMode; @@ -148,7 +148,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), getBean()); + SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), getBean()); // utilisation du mode requis setContentMode(mode); @@ -162,7 +162,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong FloatlinesCompositionUIModel floatlinesCompositionModel = getUi().getFloatlinesCompositionModel(); floatlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); floatlinesCompositionModel.setForm(form); - SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), floatlinesCompositionModel.getBean()); + SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), floatlinesCompositionModel.getBean()); FloatlinesCompositionUI compositionUI = getUi().getFloatlinesCompositionUI(); compositionUI.open(); @@ -174,7 +174,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong BranchlinesCompositionUIModel branchlinesCompositionModel = getUi().getBranchlinesCompositionModel(); branchlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); branchlinesCompositionModel.setForm(form); - SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), branchlinesCompositionModel.getBean()); + SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), branchlinesCompositionModel.getBean()); BranchlinesCompositionUI compositionUI = getUi().getBranchlinesCompositionUI(); compositionUI.open(); @@ -186,7 +186,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong HooksCompositionUIModel hooksCompositionModel = getUi().getHooksCompositionModel(); hooksCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); hooksCompositionModel.setForm(form); - SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), hooksCompositionModel.getBean()); + SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), hooksCompositionModel.getBean()); HooksCompositionUI compositionUI = getUi().getHooksCompositionUI(); compositionUI.open(); @@ -198,7 +198,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong BaitsCompositionUIModel baitsCompositionModel = getUi().getBaitsCompositionModel(); baitsCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); baitsCompositionModel.setForm(form); - SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), baitsCompositionModel.getBean()); + SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), baitsCompositionModel.getBean()); BaitsCompositionUI compositionUI = getUi().getBaitsCompositionUI(); compositionUI.open(); 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 3c05222..2473d56 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 @@ -35,7 +35,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; -import fr.ird.observe.services.dto.longline.SetLonglineDtos; +import fr.ird.observe.services.dto.longline.SetLonglineHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.SetLonglineService; import jaxx.runtime.swing.HidorButton; @@ -219,7 +219,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - SetLonglineDtos.copySetLonglineDto(form.getObject(), bean); + SetLonglineHelper.copySetLonglineDto(form.getObject(), bean); // 1. Mise à jour latitude/longitude: getUi().getSettingStartCoordinates().setLatitudeAndLongitude(bean.getSettingStartLatitude(), bean.getSettingStartLongitude()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java index b312bee..21284ac 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java @@ -31,7 +31,7 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDtos; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemHelper; import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -99,7 +99,7 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - ActivitySeineObservedSystemDtos.copyActivitySeineObservedSystemDto(form.getObject(), getBean()); + ActivitySeineObservedSystemHelper.copyActivitySeineObservedSystemDto(form.getObject(), getBean()); if (mode == ContentMode.UPDATE) { getUi().startEdit(null); 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 344f6d5..cedf4f6 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 @@ -38,9 +38,9 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; -import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDtos; +import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyHelper; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; -import fr.ird.observe.services.dto.seine.TransmittingBuoyDtos; +import fr.ird.observe.services.dto.seine.TransmittingBuoyHelper; import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -125,15 +125,15 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - FloatingObjectTransmittingBuoyDtos.copyFloatingObjectTransmittingBuoyDto(form.getObject(), bean); + FloatingObjectTransmittingBuoyHelper.copyFloatingObjectTransmittingBuoyDto(form.getObject(), bean); if (bean.sizeTransmittingBuoy() >= 1) { - TransmittingBuoyDtos.copyTransmittingBuoyDto( + TransmittingBuoyHelper.copyTransmittingBuoyDto( bean.getTransmittingBuoy(0), getUi().getTransmittingBuoy1()); if (bean.sizeTransmittingBuoy() >= 2) { - TransmittingBuoyDtos.copyTransmittingBuoyDto( + TransmittingBuoyHelper.copyTransmittingBuoyDto( bean.getTransmittingBuoy(1), getUi().getTransmittingBuoy2()); } @@ -326,7 +326,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH if (transmittingBuoy == null) { - TransmittingBuoyDtos.copyTransmittingBuoyDto(new TransmittingBuoyDto(), editBean); + TransmittingBuoyHelper.copyTransmittingBuoyDto(new TransmittingBuoyDto(), editBean); editBean.setTransmittingBuoyOperation(transmittingBuoyOperation); @@ -344,7 +344,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH } else { - TransmittingBuoyDtos.copyTransmittingBuoyDto(editBean, transmittingBuoy); + TransmittingBuoyHelper.copyTransmittingBuoyDto(editBean, transmittingBuoy); } 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 18dc3a4..3928984 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,7 +30,7 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.dto.seine.FloatingObjectDtos; +import fr.ird.observe.services.dto.seine.FloatingObjectHelper; import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; @@ -126,7 +126,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - FloatingObjectDtos.copyFloatingObjectDto(form.getObject(), bean); + FloatingObjectHelper.copyFloatingObjectDto(form.getObject(), bean); // utilisation du mode requis setContentMode(mode); 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 1ca1c8f..9f2bce1 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 @@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.dto.seine.SetSeineDtos; +import fr.ird.observe.services.dto.seine.SetSeineHelper; import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.services.service.seine.SetSeineService; import jaxx.runtime.swing.HidorButton; @@ -182,7 +182,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - SetSeineDtos.copySetSeineDto(form.getObject(), bean); + SetSeineHelper.copySetSeineDto(form.getObject(), bean); RouteService routeService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newRouteService(); 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 49ec27a..22f927f 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 @@ -30,7 +30,7 @@ import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineDtos; +import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; @@ -186,7 +186,7 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - ActivityLonglineDtos.copyActivityLonglineDto(form.getObject(), bean); + ActivityLonglineHelper.copyActivityLonglineDto(form.getObject(), bean); if (log.isDebugEnabled()) { log.debug(" long - lat = " + bean.getLongitude() + diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java index a10e2dc..6fc1047 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.open.impl.longline; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDtos; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineHelper; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.DateUtil; @@ -51,14 +51,14 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong super(ActivityLonglineDto.class); getBean().addPropertyChangeListener(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, evt -> { - boolean oldValue = VesselActivityLonglineDtos.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getOldValue()); - boolean newValue = VesselActivityLonglineDtos.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getNewValue()); + boolean oldValue = VesselActivityLonglineHelper.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getOldValue()); + boolean newValue = VesselActivityLonglineHelper.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getNewValue()); firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue); }); } public boolean isSetOperation() { - return VesselActivityLonglineDtos.isSetOperation(bean.getVesselActivityLongline()); + return VesselActivityLonglineHelper.isSetOperation(bean.getVesselActivityLongline()); } public Date getDate() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx index 414b50c..cc49ccb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx @@ -32,9 +32,9 @@ fr.ird.observe.services.dto.longline.TripLonglineActivityDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.HarbourDto - fr.ird.observe.services.dto.referential.PersonDtos + fr.ird.observe.services.dto.referential.PersonHelper fr.ird.observe.services.dto.referential.VesselDto - fr.ird.observe.services.dto.referential.VesselDtos + fr.ird.observe.services.dto.referential.VesselHelper fr.ird.observe.services.dto.referential.PersonDto fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.services.dto.referential.longline.TripTypeDto 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 4067f63..ac74bda 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 @@ -29,11 +29,11 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineDtos; -import fr.ird.observe.services.dto.referential.PersonDtos; +import fr.ird.observe.services.dto.longline.TripLonglineHelper; +import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.VesselDtos; +import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.application.swing.ui.content.ContentMode; @@ -171,7 +171,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto> { loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - TripLonglineDtos.copyTripLonglineDto(form.getObject(), bean); + TripLonglineHelper.copyTripLonglineDto(form.getObject(), bean); getUi().getTripLonglineTabPane().setSelectedIndex(0); getUi().getTripMap().getHandler().doCloseMap(); @@ -330,7 +330,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto> { switch (propertyName) { case TripLonglineDto.PROPERTY_CAPTAIN: { - result = (List) PersonDtos.filterCaptainReferences((List) result); + result = (List) PersonHelper.filterCaptainReferences((List) result); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); } @@ -338,7 +338,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto> { break; case TripLonglineDto.PROPERTY_OBSERVER: { - result = (List) PersonDtos.filterObserverReferences((List) result); + result = (List) PersonHelper.filterObserverReferences((List) result); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); } @@ -346,7 +346,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto> { break; case TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR: { - result = (List) PersonDtos.filterDataEntryOperatorReferences((List) result); + result = (List) PersonHelper.filterDataEntryOperatorReferences((List) result); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); } @@ -355,7 +355,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto> { case TripLonglineDto.PROPERTY_VESSEL: { ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); - result = (List) VesselDtos.filterVesselReferencesByVesselTypeIds((List) result, config.getLonglineVesselTypeIds()); + result = (List) VesselHelper.filterVesselReferencesByVesselTypeIds((List) result, config.getLonglineVesselTypeIds()); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); } 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 831e588..880f0b3 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 @@ -32,7 +32,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineDtos; +import fr.ird.observe.services.dto.seine.ActivitySeineHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; @@ -210,7 +210,7 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto> loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - ActivitySeineDtos.copyActivitySeineDto(form.getObject(), bean); + ActivitySeineHelper.copyActivitySeineDto(form.getObject(), bean); if (log.isDebugEnabled()) { log.debug(prefix + "long - lat = " + bean.getLongitude() + " - " + bean.getLatitude()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java index 882e503..42689e7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.open.impl.seine; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; -import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDtos; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineHelper; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; @@ -77,13 +77,13 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt ReferentialReference<VesselActivitySeineDto> oldActivitySeine = (ReferentialReference<VesselActivitySeineDto>) evt.getOldValue(); ReferentialReference<VesselActivitySeineDto> newActivitySeine = (ReferentialReference<VesselActivitySeineDto>) evt.getNewValue(); { - boolean oldValue = VesselActivitySeineDtos.isSetOperation(oldActivitySeine); - boolean newValue = VesselActivitySeineDtos.isSetOperation(newActivitySeine); + boolean oldValue = VesselActivitySeineHelper.isSetOperation(oldActivitySeine); + boolean newValue = VesselActivitySeineHelper.isSetOperation(newActivitySeine); firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue); } { - boolean oldValue = VesselActivitySeineDtos.isChangedZoneOperation(oldActivitySeine); - boolean newValue = VesselActivitySeineDtos.isChangedZoneOperation(newActivitySeine); + boolean oldValue = VesselActivitySeineHelper.isChangedZoneOperation(oldActivitySeine); + boolean newValue = VesselActivitySeineHelper.isChangedZoneOperation(newActivitySeine); firePropertyChange(PROPERTY_CHANGED_ZONE_OPERATION, oldValue, newValue); } }); @@ -111,11 +111,11 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt } public boolean isSetOperation() { - return VesselActivitySeineDtos.isSetOperation(bean.getVesselActivitySeine()); + return VesselActivitySeineHelper.isSetOperation(bean.getVesselActivitySeine()); } public boolean isChangedZoneOperation() { - return VesselActivitySeineDtos.isChangedZoneOperation(bean.getVesselActivitySeine()); + return VesselActivitySeineHelper.isChangedZoneOperation(bean.getVesselActivitySeine()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java index 7a81666..437425c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteDtos; +import fr.ird.observe.services.dto.seine.RouteHelper; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.RouteService; import org.apache.commons.logging.Log; @@ -151,7 +151,7 @@ class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - RouteDtos.copyRouteDto(form.getObject(), editBean); + RouteHelper.copyRouteDto(form.getObject(), editBean); finalizeOpenUI(mode, create); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx index c00412b..224edb6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -29,9 +29,9 @@ fr.ird.observe.services.dto.seine.RouteStubDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.HarbourDto - fr.ird.observe.services.dto.referential.PersonDtos + fr.ird.observe.services.dto.referential.PersonHelper fr.ird.observe.services.dto.referential.VesselDto - fr.ird.observe.services.dto.referential.VesselDtos + fr.ird.observe.services.dto.referential.VesselHelper fr.ird.observe.services.dto.referential.PersonDto fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.application.swing.ui.util.tripMap.TripMapUI 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 2014aa9..1c84a9a 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 @@ -27,13 +27,13 @@ import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; -import fr.ird.observe.services.dto.referential.PersonDtos; +import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.VesselDtos; +import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineDtos; +import fr.ird.observe.services.dto.seine.TripSeineHelper; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; @@ -168,7 +168,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - TripSeineDtos.copyTripSeineDto(form.getObject(), bean); + TripSeineHelper.copyTripSeineDto(form.getObject(), bean); getUi().getTripSeineTabPane().setSelectedIndex(0); getUi().getTripMap().getHandler().doCloseMap(); @@ -326,7 +326,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { switch (propertyName) { case TripSeineDto.PROPERTY_CAPTAIN: { - result = (List) PersonDtos.filterCaptainReferences((List) result); + result = (List) PersonHelper.filterCaptainReferences((List) result); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); } @@ -334,7 +334,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { break; case TripSeineDto.PROPERTY_OBSERVER: { - result = (List) PersonDtos.filterObserverReferences((List) result); + result = (List) PersonHelper.filterObserverReferences((List) result); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); } @@ -342,7 +342,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { break; case TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR: { - result = (List) PersonDtos.filterDataEntryOperatorReferences((List) result); + result = (List) PersonHelper.filterDataEntryOperatorReferences((List) result); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); } @@ -351,7 +351,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { case TripSeineDto.PROPERTY_VESSEL: { ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); - result = (List) VesselDtos.filterVesselReferencesByVesselTypeIds((List) result, config.getSeineVesselTypeIds()); + result = (List) VesselHelper.filterVesselReferencesByVesselTypeIds((List) result, config.getSeineVesselTypeIds()); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); } 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 cb59697..364713d 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl; */ import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.ReferentialReference; import org.nuiton.jaxx.widgets.number.NumberCellEditor; @@ -160,7 +160,7 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table); editor = editors.get(gearCaracteristicTypeId); - value = GearCaracteristicTypeDtos.getTypeValue(gearCaracteristicTypeId, value); + value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value); } 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 a854b76..21a22bf 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 @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.ReferentialReference; import javax.swing.JTable; @@ -95,7 +95,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); - value = GearCaracteristicTypeDtos.getTypeValue(gearCaracteristicTypeId, value); + value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIModel.java index 6be5d56..d4a211e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.BaitsCompositionDtos; +import fr.ird.observe.services.dto.longline.BaitsCompositionHelper; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; @@ -82,7 +82,7 @@ public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineGlob @Override protected void load(BaitsCompositionDto source, BaitsCompositionDto target) { - BaitsCompositionDtos.copyBaitsCompositionDto(source, target); + BaitsCompositionHelper.copyBaitsCompositionDto(source, target); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java index 32b597a..e7a78c0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; -import fr.ird.observe.services.dto.longline.BranchlinesCompositionDtos; +import fr.ird.observe.services.dto.longline.BranchlinesCompositionHelper; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; @@ -81,7 +81,7 @@ public class BranchlinesCompositionUIModel extends ContentTableUIModel<SetLongli @Override protected void load(BranchlinesCompositionDto source, BranchlinesCompositionDto target) { - BranchlinesCompositionDtos.copyBranchlinesCompositionDto(source, target); + BranchlinesCompositionHelper.copyBranchlinesCompositionDto(source, target); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java index 1a940ab..c03a5df 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; */ import fr.ird.observe.services.dto.longline.CatchLonglineDto; -import fr.ird.observe.services.dto.longline.CatchLonglineDtos; +import fr.ird.observe.services.dto.longline.CatchLonglineHelper; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; @@ -142,7 +142,7 @@ public class CatchLonglineTableModel extends ContentTableModel<SetLonglineCatchD @Override protected void load(CatchLonglineDto source, CatchLonglineDto target) { - CatchLonglineDtos.copyCatchLonglineDto(source, target); + CatchLonglineHelper.copyCatchLonglineDto(source, target); } @Override 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 bd6a0c2..20dea2b 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 @@ -31,11 +31,11 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.BranchlineDtos; +import fr.ird.observe.services.dto.longline.BranchlineHelper; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; -import fr.ird.observe.services.dto.longline.SetLonglineCatchDtos; +import fr.ird.observe.services.dto.longline.SetLonglineCatchHelper; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -586,7 +586,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat form.getObject(), form.getObject().getCatchLongline()); - SetLonglineCatchDtos.copySetLonglineCatchDto(form.getObject(), getBean()); + SetLonglineCatchHelper.copySetLonglineCatchDto(form.getObject(), getBean()); } @@ -743,7 +743,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat String setLonglineId = getDataContext().getSelectedSetLonglineId(); Form<BranchlineDto> form = getBranchLineService().loadForm(setLonglineId, newValue.getId()); - BranchlineDtos.copyBranchlineDto(form.getObject(), branchline); + BranchlineHelper.copyBranchlineDto(form.getObject(), branchline); if (ui.getValidator().getBean() == null) { ui.getValidator().setBean(getBean()); 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 072ab14..ce9386e 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 @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDtos; +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.referential.ReferentialReference; @@ -119,7 +119,7 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - ActivityLonglineEncounterDtos.copyActivityLonglineEncounterDto(form.getObject(), getBean()); + ActivityLonglineEncounterHelper.copyActivityLonglineEncounterDto(form.getObject(), getBean()); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIModel.java index fb8d192..95cfcce 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.EncounterDto; -import fr.ird.observe.services.dto.longline.EncounterDtos; +import fr.ird.observe.services.dto.longline.EncounterHelper; 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.ContentTableUIModel; @@ -80,7 +80,7 @@ public class EncounterUIModel extends ContentTableUIModel<ActivityLonglineEncoun @Override protected void load(EncounterDto source, EncounterDto target) { - EncounterDtos.copyEncounterDto(source, target); + EncounterHelper.copyEncounterDto(source, target); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java index 5816c10..7ee31e8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; -import fr.ird.observe.services.dto.longline.FloatlinesCompositionDtos; +import fr.ird.observe.services.dto.longline.FloatlinesCompositionHelper; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; @@ -78,7 +78,7 @@ public class FloatlinesCompositionUIModel extends ContentTableUIModel<SetLonglin @Override protected void load(FloatlinesCompositionDto source, FloatlinesCompositionDto target) { - FloatlinesCompositionDtos.copyFloatlinesCompositionDto(source, target); + FloatlinesCompositionHelper.copyFloatlinesCompositionDto(source, target); } @Override 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 dc016d4..7ccc087 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 @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import com.google.common.collect.Sets; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; -import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDtos; +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; @@ -157,7 +157,7 @@ public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLon @Override protected void load(GearUseFeaturesLonglineDto source, GearUseFeaturesLonglineDto target) { - GearUseFeaturesLonglineDtos.copyGearUseFeaturesLonglineDto(source, target); + GearUseFeaturesLonglineHelper.copyGearUseFeaturesLonglineDto(source, target); } @Override 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 4cb86ab..ade7f3d 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 @@ -39,9 +39,9 @@ import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; -import fr.ird.observe.services.dto.longline.TripLonglineGearUseDtos; +import fr.ird.observe.services.dto.longline.TripLonglineGearUseHelper; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -208,7 +208,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto(); measurementLonglineDto.setGearCaracteristic(input); String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); - if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) { + if (GearCaracteristicTypeHelper.isBoolean(gearCaracterisiticTypeId)) { measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString()); } return measurementLonglineDto; @@ -492,7 +492,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip Form<TripLonglineGearUseDto> form = getTripLonglineGearUseService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - TripLonglineGearUseDtos.copyTripLonglineGearUseDto(form.getObject(), getBean()); + TripLonglineGearUseHelper.copyTripLonglineGearUseDto(form.getObject(), getBean()); } protected TripLonglineGearUseService getTripLonglineGearUseService() { 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 49561c6..fe05c23 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 @@ -25,7 +25,7 @@ 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.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.ReferentialReference; /** @@ -103,7 +103,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable case 0: measure.setGearCaracteristic((ReferentialReference<GearCaracteristicDto>) aValue); String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); - if (GearCaracteristicTypeDtos.isBoolean(gearCaracteristicTypeId)) { + if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { // on force à avoir false par défaut measure.setMeasurementValue("false"); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIModel.java index 72a71ca..0f9dbd9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.HooksCompositionDto; -import fr.ird.observe.services.dto.longline.HooksCompositionDtos; +import fr.ird.observe.services.dto.longline.HooksCompositionHelper; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; @@ -80,7 +80,7 @@ public class HooksCompositionUIModel extends ContentTableUIModel<SetLonglineGlob @Override protected void load(HooksCompositionDto source, HooksCompositionDto target) { - HooksCompositionDtos.copyHooksCompositionDto(source, target); + HooksCompositionHelper.copyHooksCompositionDto(source, target); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java index a61ce45..4da79cf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDtos; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedHelper; import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; @@ -210,7 +210,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS Form<ActivityLonglineSensorUsedDto> form = getActivityLonglineSensorUsedService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - ActivityLonglineSensorUsedDtos.copyActivityLonglineSensorUsedDto(form.getObject(), getBean()); + ActivityLonglineSensorUsedHelper.copyActivityLonglineSensorUsedDto(form.getObject(), getBean()); } protected ActivityLongLineSensorUsedService getActivityLonglineSensorUsedService() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIModel.java index 2629161..5487d91 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; -import fr.ird.observe.services.dto.longline.SensorUsedDtos; +import fr.ird.observe.services.dto.longline.SensorUsedHelper; 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.ContentTableUIModel; @@ -84,7 +84,7 @@ public class SensorUsedUIModel extends ContentTableUIModel<ActivityLonglineSenso @Override protected void load(SensorUsedDto source, SensorUsedDto target) { - SensorUsedDtos.copySensorUsedDto(source, target); + SensorUsedHelper.copySensorUsedDto(source, target); } @Override 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 b3cfe61..04d8653 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 @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; -import fr.ird.observe.services.dto.longline.SetLonglineTdrDtos; +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.referential.ReferentialReference; @@ -475,7 +475,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt positionHelper.initSections(form.getObject(), form.getObject().getTdr()); - SetLonglineTdrDtos.copySetLonglineTdrDto(form.getObject(), getBean()); + SetLonglineTdrHelper.copySetLonglineTdrDto(form.getObject(), getBean()); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java index b48601a..31a9407 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.TdrDto; -import fr.ird.observe.services.dto.longline.TdrDtos; +import fr.ird.observe.services.dto.longline.TdrHelper; 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.ContentTableUIModel; @@ -170,7 +170,7 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> { @Override protected void load(TdrDto source, TdrDto target) { - TdrDtos.copyTdrDto(source, target); + TdrHelper.copyTdrDto(source, target); } @Override 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 fb231e7..d5b2b1f 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 @@ -24,7 +24,7 @@ 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.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; @@ -103,7 +103,7 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit case 0: measure.setGearCaracteristic((ReferentialReference<GearCaracteristicDto>) aValue); String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); - if (GearCaracteristicTypeDtos.isBoolean(gearCaracteristicTypeId)) { + if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { // on force à avoir false par défaut measure.setMeasurementValue("false"); } 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 00fb598..98ece53 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 @@ -27,7 +27,7 @@ import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; -import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDtos; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineHelper; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; @@ -159,7 +159,7 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeineG @Override protected void load(GearUseFeaturesSeineDto source, GearUseFeaturesSeineDto target) { - GearUseFeaturesSeineDtos.copyGearUseFeaturesSeineDto(source, target); + GearUseFeaturesSeineHelper.copyGearUseFeaturesSeineDto(source, target); } @Override 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 fb8f4a8..2b724f7 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 @@ -36,7 +36,7 @@ import fr.ird.observe.application.swing.ui.content.table.impl.GearUseFeatureMeas import fr.ird.observe.application.swing.ui.content.table.impl.GearUseFeatureMeasurementCellRenderer; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -44,7 +44,7 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import fr.ird.observe.services.dto.seine.TripSeineGearUseDtos; +import fr.ird.observe.services.dto.seine.TripSeineGearUseHelper; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.TripSeineGearUseService; import jaxx.runtime.SwingUtil; @@ -206,7 +206,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei .map(input -> { GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto(); String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); - if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) { + if (GearCaracteristicTypeHelper.isBoolean(gearCaracterisiticTypeId)) { measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString()); } measurementSeineDto.setGearCaracteristic(input); @@ -491,7 +491,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei Form<TripSeineGearUseDto> form = getTripSeineGearUseService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - TripSeineGearUseDtos.copyTripSeineGearUseDto(form.getObject(), getBean()); + TripSeineGearUseHelper.copyTripSeineGearUseDto(form.getObject(), getBean()); } protected TripSeineGearUseService getTripSeineGearUseService() { 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 17ec378..1169eb6 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 @@ -37,9 +37,9 @@ import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; -import fr.ird.observe.services.dto.seine.NonTargetCatchDtos; +import fr.ird.observe.services.dto.seine.NonTargetCatchHelper; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; -import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDtos; +import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper; import fr.ird.observe.services.service.seine.NonTargetCatchService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.application.swing.ui.UIHelper; @@ -302,7 +302,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa ReferentialReference<SpeciesDto> species = nonTargetCatchDto.getSpecies(); - Iterable<NonTargetCatchDto> currentTargetCatchSpecies = NonTargetCatchDtos.filterBySpecies(objets, species); + Iterable<NonTargetCatchDto> currentTargetCatchSpecies = NonTargetCatchHelper.filterBySpecies(objets, species); if (Iterables.isEmpty(currentTargetCatchSpecies)) { @@ -364,7 +364,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - SetSeineNonTargetCatchDtos.copySetSeineNonTargetCatchDto(form.getObject(), getBean()); + SetSeineNonTargetCatchHelper.copySetSeineNonTargetCatchDto(form.getObject(), getBean()); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java index 72b2801..0f90dae 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; -import fr.ird.observe.services.dto.seine.NonTargetCatchDtos; +import fr.ird.observe.services.dto.seine.NonTargetCatchHelper; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; @@ -93,7 +93,7 @@ public class NonTargetCatchUIModel extends ContentTableUIModel<SetSeineNonTarget @Override protected void load(NonTargetCatchDto source, NonTargetCatchDto target) { - NonTargetCatchDtos.copyNonTargetCatchDto(source, target); + NonTargetCatchHelper.copyNonTargetCatchDto(source, target); } @Override 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 d951de4..48e70f5 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 @@ -33,7 +33,7 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; -import fr.ird.observe.services.dto.seine.NonTargetSampleDtos; +import fr.ird.observe.services.dto.seine.NonTargetSampleHelper; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.NonTargetSampleService; import fr.ird.observe.application.swing.ui.UIHelper; @@ -302,7 +302,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam Form<NonTargetSampleDto> form = getNonTargetSampleService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - NonTargetSampleDtos.copyNonTargetSampleDto(form.getObject(), getBean()); + NonTargetSampleHelper.copyNonTargetSampleDto(form.getObject(), getBean()); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java index 4a368b3..8422035 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; -import fr.ird.observe.services.dto.seine.NonTargetLengthDtos; +import fr.ird.observe.services.dto.seine.NonTargetLengthHelper; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; @@ -94,7 +94,7 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD @Override protected void load(NonTargetLengthDto source, NonTargetLengthDto target) { - NonTargetLengthDtos.copyNonTargetLengthDto(source, target); + NonTargetLengthHelper.copyNonTargetLengthDto(source, target); } @Override 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 25343fd..5ceccd7 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 @@ -32,7 +32,7 @@ import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; -import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDtos; +import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesHelper; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.service.ReferentialService; @@ -113,7 +113,7 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati Form<FloatingObjectObservedSpeciesDto> form = getObjectObservedSpeciesService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - FloatingObjectObservedSpeciesDtos.copyFloatingObjectObservedSpeciesDto(form.getObject(), getBean()); + FloatingObjectObservedSpeciesHelper.copyFloatingObjectObservedSpeciesDto(form.getObject(), getBean()); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java index d7716d9..8fb8efb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; -import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDtos; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesHelper; 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.ContentTableUIModel; @@ -80,7 +80,7 @@ public class ObjectObservedSpeciesUIModel extends ContentTableUIModel<FloatingOb @Override protected void load(ObjectObservedSpeciesDto source, ObjectObservedSpeciesDto target) { - ObjectObservedSpeciesDtos.copyObjectObservedSpeciesDto(source, target); + ObjectObservedSpeciesHelper.copyObjectObservedSpeciesDto(source, target); } @Override 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 931cb44..9e2ae87 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 @@ -31,7 +31,7 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; -import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDtos; +import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateHelper; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; @@ -109,7 +109,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin Form<FloatingObjectSchoolEstimateDto> form = getObjectSchoolEstimateService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - FloatingObjectSchoolEstimateDtos.copyFloatingObjectSchoolEstimateDto(form.getObject(), getBean()); + FloatingObjectSchoolEstimateHelper.copyFloatingObjectSchoolEstimateDto(form.getObject(), getBean()); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java index ae93508..cda4a16 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDtos; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateHelper; 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.ContentTableUIModel; @@ -78,7 +78,7 @@ public class ObjectSchoolEstimateUIModel extends ContentTableUIModel<FloatingObj @Override protected void load(ObjectSchoolEstimateDto source, ObjectSchoolEstimateDto target) { - ObjectSchoolEstimateDtos.copyObjectSchoolEstimateDto(source, target); + ObjectSchoolEstimateHelper.copyObjectSchoolEstimateDto(source, target); } @Override 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 3032ad0..affc96d 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 @@ -32,7 +32,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; -import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDtos; +import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateHelper; import fr.ird.observe.services.service.seine.SchoolEstimateService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.application.swing.ui.UIHelper; @@ -140,7 +140,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo Form<SetSeineSchoolEstimateDto> form = getSchoolEstimateService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - SetSeineSchoolEstimateDtos.copySetSeineSchoolEstimateDto(form.getObject(), getBean()); + SetSeineSchoolEstimateHelper.copySetSeineSchoolEstimateDto(form.getObject(), getBean()); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIModel.java index cfed525..78e8fbd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; -import fr.ird.observe.services.dto.seine.SchoolEstimateDtos; +import fr.ird.observe.services.dto.seine.SchoolEstimateHelper; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; @@ -80,7 +80,7 @@ public class SchoolEstimateUIModel extends ContentTableUIModel<SetSeineSchoolEst @Override protected void load(SchoolEstimateDto source, SchoolEstimateDto target) { - SchoolEstimateDtos.copySchoolEstimateDto(source, target); + SchoolEstimateHelper.copySchoolEstimateDto(source, target); } @Override 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 0f89226..c62aedf 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 @@ -31,13 +31,13 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferences; 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.WeightCategoryDtos; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; -import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDtos; +import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; -import fr.ird.observe.services.dto.seine.TargetCatchDtos; +import fr.ird.observe.services.dto.seine.TargetCatchHelper; import fr.ird.observe.services.service.seine.TargetCatchService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.application.swing.ui.UIHelper; @@ -124,7 +124,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa ReferentialReference<SpeciesDto> species = targetCatchDto.getSpecies(); - Iterable<TargetCatchDto> currentTargetCatchSpecies = TargetCatchDtos.filterBySpecies(currentSetSeineTargetCatch.getTargetCatch(), species); + Iterable<TargetCatchDto> currentTargetCatchSpecies = TargetCatchHelper.filterBySpecies(currentSetSeineTargetCatch.getTargetCatch(), species); if (Iterables.isEmpty(currentTargetCatchSpecies)) { @@ -263,7 +263,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa // un espèce est selectionnee, on calcule les categories pour cette espèce // on ne conserve que les categories de l'espèce Set<ReferentialReference<WeightCategoryDto>> allCategories = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); - availableCategories = WeightCategoryDtos.filterSpeciesWeightCategories(allCategories, species.getId()); + availableCategories = WeightCategoryHelper.filterSpeciesWeightCategories(allCategories, species.getId()); } @@ -289,7 +289,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, false); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - SetSeineTargetCatchDtos.copySetSeineTargetCatchDto(form.getObject(), getBean()); + SetSeineTargetCatchHelper.copySetSeineTargetCatchDto(form.getObject(), getBean()); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIModel.java index 3a56e7d..db83af5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIModel.java @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; -import fr.ird.observe.services.dto.seine.TargetCatchDtos; +import fr.ird.observe.services.dto.seine.TargetCatchHelper; 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.ContentTableUIModel; @@ -86,7 +86,7 @@ public class TargetCatchUIModel extends ContentTableUIModel<SetSeineTargetCatchD @Override protected void load(TargetCatchDto source, TargetCatchDto target) { - TargetCatchDtos.copyTargetCatchDto(source, target); + TargetCatchHelper.copyTargetCatchDto(source, target); } @Override 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 e9a0ef2..c8371da 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 @@ -33,13 +33,13 @@ import fr.ird.observe.services.dto.referential.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; -import fr.ird.observe.services.dto.referential.seine.WeightCategoryDtos; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; -import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDtos; +import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; -import fr.ird.observe.services.dto.seine.TargetCatchDtos; +import fr.ird.observe.services.dto.seine.TargetCatchHelper; import fr.ird.observe.services.service.seine.TargetCatchService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.application.swing.ui.UIHelper; @@ -179,7 +179,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT ReferentialReference<SpeciesDto> species = targetCatchDto.getSpecies(); - Iterable<TargetCatchDto> currentTargetCatchSpecies = TargetCatchDtos.filterBySpecies(currentSetSeineTargetCatch.getTargetCatch(), species); + Iterable<TargetCatchDto> currentTargetCatchSpecies = TargetCatchHelper.filterBySpecies(currentSetSeineTargetCatch.getTargetCatch(), species); if (Iterables.isEmpty(currentTargetCatchSpecies)) { @@ -428,7 +428,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT protected List<ReferentialReference<WeightCategoryDto>> buildWeightCategoryList(ReferentialReference<SpeciesDto> species) { Set<ReferentialReference<WeightCategoryDto>> allCategories = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); - List<ReferentialReference<WeightCategoryDto>> weightCategoryList = WeightCategoryDtos.filterSpeciesWeightCategories(allCategories, species.getId()); + List<ReferentialReference<WeightCategoryDto>> weightCategoryList = WeightCategoryHelper.filterSpeciesWeightCategories(allCategories, species.getId()); // on filtre toutes les categories qui ont deja references sur toutes les raisons de rejet removeFullyUsedWeightCategories(weightCategoryList); @@ -500,7 +500,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, true); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - SetSeineTargetCatchDtos.copySetSeineTargetCatchDto(form.getObject(), getBean()); + SetSeineTargetCatchHelper.copySetSeineTargetCatchDto(form.getObject(), getBean()); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java index 8592510..f21b8f2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; -import fr.ird.observe.services.dto.seine.TargetCatchDtos; +import fr.ird.observe.services.dto.seine.TargetCatchHelper; 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.ContentTableUIModel; @@ -86,7 +86,7 @@ public class TargetDiscardCatchUIModel extends ContentTableUIModel<SetSeineTarge @Override protected void load(TargetCatchDto source, TargetCatchDto target) { - TargetCatchDtos.copyTargetCatchDto(source, target); + TargetCatchHelper.copyTargetCatchDto(source, target); } @Override 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 246369b..13f5583 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 @@ -32,7 +32,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; -import fr.ird.observe.services.dto.seine.TargetSampleDtos; +import fr.ird.observe.services.dto.seine.TargetSampleHelper; import fr.ird.observe.services.service.seine.TargetSampleService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; @@ -319,7 +319,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto Form<TargetSampleDto> form = getTargetSampleService().loadForm(beanId, discarded); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - TargetSampleDtos.copyTargetSampleDto(form.getObject(), getBean()); + TargetSampleHelper.copyTargetSampleDto(form.getObject(), getBean()); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java index 7ee1b97..27f4dd1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.services.dto.seine.TargetLengthDto; -import fr.ird.observe.services.dto.seine.TargetLengthDtos; +import fr.ird.observe.services.dto.seine.TargetLengthHelper; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; @@ -87,7 +87,7 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta @Override protected void load(TargetLengthDto source, TargetLengthDto target) { - TargetLengthDtos.copyTargetLengthDto(source, target); + TargetLengthHelper.copyTargetLengthDto(source, target); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java index ba58eeb..97198c2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java @@ -31,9 +31,9 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ProgramDtos; +import fr.ird.observe.services.dto.referential.ProgramHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialDtos; +import fr.ird.observe.services.dto.referential.ReferentialHelper; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.longline.TripLonglineService; @@ -75,21 +75,21 @@ public class DataSelectionModel implements Serializable { for (ReferentialReference<ProgramDto> program : programSet) { - List<DataReference> referenceDtos = Lists.newArrayList(); + List<DataReference> referenceHelper = Lists.newArrayList(); - if (ProgramDtos.isProgramSeine(program)) { + if (ProgramHelper.isProgramSeine(program)) { DataReferenceSet<TripSeineDto> tripSeineRef = tripSeineService.getTripSeineByProgram(program.getId()); - referenceDtos.addAll(tripSeineRef.getReferences()); + referenceHelper.addAll(tripSeineRef.getReferences()); - } else if (ProgramDtos.isProgramLongline(program)) { + } else if (ProgramHelper.isProgramLongline(program)) { DataReferenceSet<TripLonglineDto> tripLonglineRef = tripLonglineService.getTripLonglineByProgram(program.getId()); - referenceDtos.addAll(tripLonglineRef.getReferences()); + referenceHelper.addAll(tripLonglineRef.getReferences()); } - populate(program, referenceDtos, datas); + populate(program, referenceHelper, datas); } model.setDatas(datas); @@ -164,7 +164,7 @@ public class DataSelectionModel implements Serializable { public DataSelectionModel() { pcs = new PropertyChangeSupport(this); - referentiel = Sets.newHashSet(ReferentialDtos.REFERENCE_DTOS); + referentiel = Sets.newHashSet(ReferentialHelper.REFERENCE_DTOS); selectedReferentiel = Sets.newHashSet(); nbReferentiels = referentiel.size(); } @@ -250,12 +250,12 @@ public class DataSelectionModel implements Serializable { // on recherche son program for (ReferentialReference<ProgramDto> p : datas.keySet()) { if (datas.get(p).contains(referenceDto)) { - List<DataReference> referenceDtos = result.get(p); - if (referenceDtos == null) { - referenceDtos = Lists.newArrayList(); - result.put(p, referenceDtos); + List<DataReference> referenceHelper = result.get(p); + if (referenceHelper == null) { + referenceHelper = Lists.newArrayList(); + result.put(p, referenceHelper); } - referenceDtos.add(referenceDto); + referenceHelper.add(referenceDto); break; } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java index a049a4b..d5cd928 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.ObserveDbUserDto; -import fr.ird.observe.services.dto.ObserveDbUserDtos; +import fr.ird.observe.services.dto.ObserveDbUserHelper; import fr.ird.observe.services.dto.constants.ObserveDbRole; import javax.swing.table.AbstractTableModel; @@ -92,7 +92,7 @@ public class RolesTableModel extends AbstractTableModel { this.model = model; this.roles = Lists.newArrayList(model.getUsersWithoutAdministrator()); - Collections.sort(this.roles, ObserveDbUserDtos.getUserDtoComparator()); + Collections.sort(this.roles, ObserveDbUserHelper.getUserDtoComparator()); fireTableDataChanged(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java index b3d045d..f82015b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs; import com.google.common.collect.Sets; import fr.ird.observe.services.dto.ObserveDbUserDto; -import fr.ird.observe.services.dto.ObserveDbUserDtos; +import fr.ird.observe.services.dto.ObserveDbUserHelper; import fr.ird.observe.services.dto.constants.ObserveDbRole; import java.beans.PropertyChangeListener; @@ -68,14 +68,14 @@ public class SecurityModel implements Serializable { public Set<ObserveDbUserDto> getUsersByRole(ObserveDbRole role) { return users.stream() - .filter(ObserveDbUserDtos.newRolePredicate(role)) + .filter(ObserveDbUserHelper.newRolePredicate(role)) .collect(Collectors.toSet()); } public List<String> getUserNamesByRole(ObserveDbRole role) { return users.stream() - .filter(ObserveDbUserDtos.newRolePredicate(role)) - .map(ObserveDbUserDtos.NAME_FUNCTION) + .filter(ObserveDbUserHelper.newRolePredicate(role)) + .map(ObserveDbUserHelper.NAME_FUNCTION) .collect(Collectors.toList()); } @@ -100,7 +100,7 @@ public class SecurityModel implements Serializable { } public Set<ObserveDbUserDto> getUsersWithoutAdministrator() { - Predicate<ObserveDbUserDto> predicate = ObserveDbUserDtos.newRolePredicate(ObserveDbRole.ADMINISTRATOR); + Predicate<ObserveDbUserDto> predicate = ObserveDbUserHelper.newRolePredicate(ObserveDbRole.ADMINISTRATOR); return users.stream().filter(u -> !predicate.test(u)).collect(Collectors.toSet()); } @@ -112,7 +112,7 @@ public class SecurityModel implements Serializable { this.users.clear(); this.users.addAll(users); - Optional<ObserveDbUserDto> optionalAdministrator = users.stream().filter(ObserveDbUserDtos.newRolePredicate(ObserveDbRole.ADMINISTRATOR)).findFirst(); + Optional<ObserveDbUserDto> optionalAdministrator = users.stream().filter(ObserveDbUserHelper.newRolePredicate(ObserveDbRole.ADMINISTRATOR)).findFirst(); if (optionalAdministrator.isPresent()) { this.administrateur = optionalAdministrator.get(); } else { @@ -142,7 +142,7 @@ public class SecurityModel implements Serializable { } public int getAssigned() { - int countNotAssigned = (int) users.stream().filter(ObserveDbUserDtos.newRolePredicate(null)).count(); + int countNotAssigned = (int) users.stream().filter(ObserveDbUserHelper.newRolePredicate(null)).count(); return users.size() - countNotAssigned; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java index d64c83c..9bb6457 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.ObserveServicesProvider; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.application.swing.ui.tree.ObserveNode; @@ -74,7 +74,7 @@ public class ChangeTripProgramActionListener extends NodeChangeActionListener { ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); ObserveServicesProvider servicesProvider = applicationContext.getMainDataSourceServicesProvider(); - if (IdDtos.isTripLonglineId(nodeId)) { + if (IdHelper.isTripLonglineId(nodeId)) { TripLonglineService service = servicesProvider.newTripLonglineService(); position = service.moveTripLonglineToProgram(nodeId, parentNodeId); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java index e8d686b..fd1060e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.services.dto.referential.ReferentialDtos; +import fr.ird.observe.services.dto.referential.ReferentialHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.List; @@ -41,19 +41,19 @@ class ReferenceNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { public static class CommonReferenceNodeChildLoador extends ReferenceNodeChildLoador { public CommonReferenceNodeChildLoador() { - super(ReferentialDtos.REFERENCE_COMMON_DTOS); + super(ReferentialHelper.REFERENCE_COMMON_DTOS); } } public static class SeineReferenceNodeChildLoador extends ReferenceNodeChildLoador { public SeineReferenceNodeChildLoador() { - super(ReferentialDtos.REFERENCE_SEINE_DTOS); + super(ReferentialHelper.REFERENCE_SEINE_DTOS); } } public static class LonglineReferenceNodeChildLoador extends ReferenceNodeChildLoador { public LonglineReferenceNodeChildLoador() { - super(ReferentialDtos.REFERENCE_LONGLINE_DTOS); + super(ReferentialHelper.REFERENCE_LONGLINE_DTOS); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java index 2918b24..ac35ffe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.menu; */ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.tree.ObserveNode; @@ -73,7 +73,7 @@ public class MoveActivityLonglineNodeMenuPopulator extends MoveNodeMenuPopulator // si le noeud de marée n'est pas le même que le parent actuel // si le noeud est bien un noeud de marée longline - if (!parentNode.equals(tripNode) && IdDtos.isTripLonglineId(tripId)) { + if (!parentNode.equals(tripNode) && IdHelper.isTripLonglineId(tripId)) { possibleParents.add(DecoratedNodeEntity.newDecoratedNodeEntity(tripNode, tripDecorator)); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java index 3cd4936..4baab6b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.menu; */ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.tree.ObserveNode; @@ -73,7 +73,7 @@ public class MoveActivitySeineNodeMenuPopulator extends MoveNodeMenuPopulator { // si le noeud de marée n'est pas le même que le parent actuel // si le noeud est bien un noeud de marée seine - if (!parentNode.equals(routeNode) && IdDtos.isRouteId(routeId)) { + if (!parentNode.equals(routeNode) && IdHelper.isRouteId(routeId)) { possibleParents.add(DecoratedNodeEntity.newDecoratedNodeEntity(routeNode, routeDecorator)); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java index eff9dd8..09cf29c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.menu; */ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.tree.ObserveNode; @@ -73,7 +73,7 @@ public class MoveRouteNodeMenuPopulator extends MoveNodeMenuPopulator { // si le noeud de marée n'est pas le même que le parent actuel // si le noeud est bien un noeud de marée seine - if (!parentNode.equals(tripNode) && IdDtos.isTripSeineId(tripId)) { + if (!parentNode.equals(tripNode) && IdHelper.isTripSeineId(tripId)) { possibleParents.add(DecoratedNodeEntity.newDecoratedNodeEntity(tripNode, tripDecorator)); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java index bcb6869..5edf126 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.menu; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.application.swing.ui.tree.ObserveNode; @@ -63,7 +63,7 @@ public class MoveTripNodeMenuPopulator extends MoveNodeMenuPopulator { List<DecoratedNodeEntity> possibleParents = new ArrayList<>(); // noeud longline ? - GearType gearType = IdDtos.isLonglineId(tripNode.getId()) ? GearType.longline : GearType.seine; + GearType gearType = IdHelper.isLonglineId(tripNode.getId()) ? GearType.longline : GearType.seine; // racine ObserveNode rootNode = treeHelper.getRootNode(); @@ -84,7 +84,7 @@ public class MoveTripNodeMenuPopulator extends MoveNodeMenuPopulator { // si le noeud programme n'est pas le même que le parent actuel // si le noeud est bien un noeud de programme - if (IdDtos.isProgramId(programId) && !oldProgramId.equals(programId)) { + if (IdHelper.isProgramId(programId) && !oldProgramId.equals(programId)) { if (programNode instanceof ProgramSeineNode && GearType.seine == gearType) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java index ebb7222..a3adc68 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.application.swing.ui.UIHelper; @@ -129,11 +129,11 @@ public class TripMapUIHandler { mapContentBuilder.addLayer(layerFile); } - if (IdDtos.isSeineId(tripMapDto.getId())) { + if (IdHelper.isSeineId(tripMapDto.getId())) { mapContentBuilder.addTripLine(tripMapPoints); - } else if (IdDtos.isLonglineId(tripMapDto.getId())) { + } else if (IdHelper.isLonglineId(tripMapDto.getId())) { mapContentBuilder.addLonglineFishingZone(tripMapPoints); mapContentBuilder.addLonglineLine(tripMapPoints); diff --git a/pom.xml b/pom.xml index e581f56..1e5d7e8 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <eugenePluginVersion>3.0-alpha-8</eugenePluginVersion> + <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.1.3.1</topiaVersion> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index dbbf1e3..98564be 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -130,7 +130,7 @@ <input>zargo</input> </inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - <templates>org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer</templates> + <templates>org.nuiton.eugene.java.BeanTransformer</templates> <failIfUnsafe>true</failIfUnsafe> <defaultPackage>fr.ird.observe.services.dto</defaultPackage> <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath> diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/DataReference.java b/services-dto/src/main/java/fr/ird/observe/services/dto/DataReference.java index c5778a7..8898b67 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/DataReference.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/DataReference.java @@ -48,11 +48,11 @@ public class DataReference<D extends DataDto> extends AbstractReference<D> { } public static Predicate<DataReference> newTripSeinePredicate() { - return input -> IdDtos.isTripSeineId(input.getId()); + return input -> IdHelper.isTripSeineId(input.getId()); } public static <BeanType extends IdDto> java.util.function.Predicate<BeanType> newTripLonglinePredicate() { - return input -> IdDtos.isTripLonglineId(input.getId()); + return input -> IdHelper.isTripLonglineId(input.getId()); } @Override diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/IdDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/IdDto.java index adef000..6533073 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/IdDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/IdDto.java @@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.Objects; -public abstract class IdDto extends AbstractIdDto { +public abstract class IdDto extends GeneratedIdDto { private static final long serialVersionUID = 1L; @@ -44,8 +44,8 @@ public abstract class IdDto extends AbstractIdDto { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof AbstractIdDto)) return false; - AbstractIdDto that = (AbstractIdDto) o; + if (!(o instanceof GeneratedIdDto)) return false; + GeneratedIdDto that = (GeneratedIdDto) o; return !(id == null || that.id == null) && Objects.equals(id, that.id); } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/IdDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/IdHelper.java similarity index 98% rename from services-dto/src/main/java/fr/ird/observe/services/dto/IdDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/IdHelper.java index da38617..4e57a0e 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/IdDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/IdHelper.java @@ -36,7 +36,7 @@ import java.util.function.Predicate; import static fr.ird.observe.services.dto.AbstractReference.newIdPredicate; -public class IdDtos extends AbstractIdDtos { +public class IdHelper extends GeneratedIdHelper { public static <BeanType extends IdDto> BeanType findById(Collection<BeanType> source, String id) { return source.stream().filter(newIdPredicate(id)::test).findFirst().orElse(null); @@ -164,4 +164,4 @@ public class IdDtos extends AbstractIdDtos { return Maps.uniqueIndex(dtos, ID_FUNCTION::apply); } -} //IdDtos +} //IdHelper diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDbUserHelper.java similarity index 94% rename from services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDbUserHelper.java index c4e5431..d06e1eb 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveDbUserHelper.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto; import java.util.Comparator; -public class ObserveDbUserDtos extends AbstractObserveDbUserDtos { +public class ObserveDbUserHelper extends GeneratedObserveDbUserHelper { protected static final UserDtoComparator USER_DTO_COMPARATOR = new UserDtoComparator(); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java index acd82a1..92a3e23 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.dto.constants; import fr.ird.observe.services.dto.referential.I18nReferentialDto; -import fr.ird.observe.services.dto.referential.I18nReferentialDtos; +import fr.ird.observe.services.dto.referential.I18nReferentialHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Locale; @@ -125,7 +125,7 @@ public enum ReferentialLocale { public <E extends I18nReferentialDto> String getLabel(E i18nEntity) { - return I18nReferentialDtos.decorate(ordinal(), i18nEntity); + return I18nReferentialHelper.decorate(ordinal(), i18nEntity); } } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java index 6003f93..972a2fc 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java @@ -26,7 +26,7 @@ import org.nuiton.util.DateUtil; import java.util.Date; -public class ActivityLonglineDto extends AbstractActivityLonglineDto { +public class ActivityLonglineDto extends GeneratedActivityLonglineDto { private static final long serialVersionUID = 3991657324991701860L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java index f89d1f2..e5ef835 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/GearUseFeaturesMeasurementLonglineDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.longline; * #L% */ -public class GearUseFeaturesMeasurementLonglineDto extends AbstractGearUseFeaturesMeasurementLonglineDto { +public class GearUseFeaturesMeasurementLonglineDto extends GeneratedGearUseFeaturesMeasurementLonglineDto { private static final long serialVersionUID = 4121465684829026103L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplateHelper.java similarity index 97% rename from services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplateHelper.java index 191e554..4af7d40 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplateHelper.java @@ -36,7 +36,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class SectionWithTemplates { +public class SectionWithTemplateHelper { public static List<SectionWithTemplate> getSectionTemplates(Collection<SectionDto> sections) { diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java index 352f7d6..70f860e 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.longline; * #L% */ -public class SetLonglineGlobalCompositionDto extends AbstractSetLonglineGlobalCompositionDto { +public class SetLonglineGlobalCompositionDto extends GeneratedSetLonglineGlobalCompositionDto { private static final long serialVersionUID = 3473510292736074595L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeHelper.java similarity index 97% rename from services-dto/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeHelper.java index a6ac0ce..cba68ac 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeHelper.java @@ -26,7 +26,7 @@ import com.google.common.collect.Sets; import java.util.Set; -public class GearCaracteristicTypeDtos extends AbstractGearCaracteristicTypeDtos { +public class GearCaracteristicTypeHelper extends GeneratedGearCaracteristicTypeHelper { private static final Set<String> INTEGER_IDS = Sets.newHashSet( "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3", diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java index 99cef65..be4a7a8 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.referential; * #L% */ -public abstract class I18nReferentialDto extends AbstractI18nReferentialDto { +public abstract class I18nReferentialDto extends GeneratedI18nReferentialDto { private static final long serialVersionUID = 3832622876506665573L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialHelper.java similarity index 95% rename from services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialHelper.java index 936c511..cccae2e 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialHelper.java @@ -22,8 +22,7 @@ package fr.ird.observe.services.dto.referential; * #L% */ -public class I18nReferentialDtos extends AbstractI18nReferentialDtos { - +public class I18nReferentialHelper extends GeneratedI18nReferentialHelper { public static <E extends I18nReferentialDto> String decorate(int referenceLocaleOrdinal, E i18nDto) { diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java similarity index 98% rename from services-dto/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java index 256ebf7..47749c1 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java @@ -29,7 +29,7 @@ import java.util.Objects; import java.util.function.Predicate; import java.util.stream.Collectors; -public class PersonDtos extends AbstractPersonDtos { +public class PersonHelper extends GeneratedPersonHelper { public static List<ReferentialReference<PersonDto>> filterCaptainReferences(Collection<ReferentialReference<PersonDto>> incoming) { return incoming.stream().filter(newCaptainReferencePredicate()).collect(Collectors.toList()); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java index 59c3853..bbe7fe7 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.referential; * #L% */ -public class ProgramDto extends AbstractProgramDto { +public class ProgramDto extends GeneratedProgramDto { private static final long serialVersionUID = 1L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java similarity index 97% rename from services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java index 3a53f56..c91758b 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto.referential; import fr.ird.observe.services.dto.constants.GearType; -public class ProgramDtos extends AbstractProgramDtos { +public class ProgramHelper extends GeneratedProgramHelper { public static boolean isProgramLongline(ReferentialReference<ProgramDto> programDtoRef) { diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java index a85f3c8..2311495 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java @@ -27,7 +27,7 @@ import fr.ird.observe.services.dto.constants.ReferenceStatus; import static fr.ird.observe.services.dto.referential.ReferentialReference.PROPERTY_ENABLED; -public abstract class ReferentialDto extends AbstractReferentialDto { +public abstract class ReferentialDto extends GeneratedReferentialDto { private static final long serialVersionUID = 1L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java similarity index 98% rename from services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java index 4b8b631..9167511 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java @@ -65,7 +65,7 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; -public class ReferentialDtos extends AbstractReferentialDtos { +public class ReferentialHelper extends GeneratedReferentialHelper { public static final ImmutableSet<Class<? extends ReferentialDto>> REFERENCE_COMMON_DTOS = ImmutableSet.of( VesselSizeCategoryDto.class, diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java index 9c0458a..dffc415 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.dto.referential; import java.util.Set; import java.util.stream.Collectors; -public class SpeciesListDto extends AbstractSpeciesListDto { +public class SpeciesListDto extends GeneratedSpeciesListDto { private static final long serialVersionUID = 4123107259984590690L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/VesselHelper.java similarity index 97% rename from services-dto/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/VesselHelper.java index 857026d..30bd69d 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/VesselDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/VesselHelper.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; -public class VesselDtos extends AbstractVesselDtos { +public class VesselHelper extends GeneratedVesselHelper { public static List<ReferentialReference<VesselDto>> filterVesselReferencesByVesselTypeIds(Collection<ReferentialReference<VesselDto>> incoming, Set<String> vesselTypeIds) { diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineHelper.java similarity index 92% rename from services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineHelper.java index baa1c07..2a5a772 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineHelper.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto.referential.longline; import fr.ird.observe.services.dto.referential.ReferentialReference; -public class VesselActivityLonglineDtos extends AbstractVesselActivityLonglineDtos { +public class VesselActivityLonglineHelper extends GeneratedVesselActivityLonglineHelper { private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; @@ -41,4 +41,4 @@ public class VesselActivityLonglineDtos extends AbstractVesselActivityLonglineDt } -} //VesselActivityLonglineDtos +} //VesselActivityLonglineHelper diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java similarity index 95% rename from services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java index cad08b3..9541de0 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto.referential.seine; import fr.ird.observe.services.dto.referential.ReferentialReference; -public class VesselActivitySeineDtos extends AbstractVesselActivitySeineDtos { +public class VesselActivitySeineHelper extends GeneratedVesselActivitySeineHelper { private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586"; @@ -54,4 +54,4 @@ public class VesselActivitySeineDtos extends AbstractVesselActivitySeineDtos { return vesselActivitySeineRef != null && isChangedZoneOperation(vesselActivitySeineRef.getId()); } -} //VesselActivitySeineDtos +} //VesselActivitySeineHelper diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java similarity index 96% rename from services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java index 5e0e105..2f88bc3 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java @@ -31,10 +31,10 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; -public class WeightCategoryDtos extends AbstractWeightCategoryDtos { +public class WeightCategoryHelper extends GeneratedWeightCategoryHelper { /** Logger. */ - private static final Log log = LogFactory.getLog(WeightCategoryDtos.class); + private static final Log log = LogFactory.getLog(WeightCategoryHelper.class); /** * @param speciesId l'identifiant de l'espèce diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java index 17ed413..fd0ba24 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto.result; import fr.ird.observe.services.dto.IdDto; -public class SaveResultDto extends AbstractSaveResultDto { +public class SaveResultDto extends GeneratedSaveResultDto { private static final long serialVersionUID = 1L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultHelper.java similarity index 94% rename from services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultHelper.java index 1d952f8..7af9b5e 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/result/SaveResultHelper.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto.result; import java.util.Date; -public class SaveResultDtos extends AbstractSaveResultDtos { +public class SaveResultHelper extends GeneratedSaveResultHelper { public static SaveResultDto of(String id, Date lastUpdateDate) { SaveResultDto result = new SaveResultDto(); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultHelper.java similarity index 92% rename from services-dto/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultHelper.java index cc03dbc..8bdcb36 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultHelper.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.result; * #L% */ -public class TripChildSaveResultDtos extends AbstractTripChildSaveResultDtos { +public class TripChildSaveResultHelper extends GeneratedTripChildSaveResultHelper { public static TripChildSaveResultDto of(SaveResultDto incoming) { TripChildSaveResultDto result = new TripChildSaveResultDto(); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java index 56be3f0..5b3e38a 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java @@ -27,7 +27,7 @@ import org.nuiton.util.DateUtil; import java.util.Date; -public class ActivitySeineDto extends AbstractActivitySeineDto { +public class ActivitySeineDto extends GeneratedActivitySeineDto { public static final String ACTIVITY_FIN_DE_VEILLE = "16"; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java index 7a1b84e..8588438 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java @@ -26,7 +26,7 @@ import org.nuiton.util.DateUtil; import java.util.Date; -public class ActivitySeineStubDto extends AbstractActivitySeineStubDto { +public class ActivitySeineStubDto extends GeneratedActivitySeineStubDto { private static final long serialVersionUID = 4062867418771566898L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java index 8c8eea0..071595a 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java @@ -27,7 +27,7 @@ import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; -public class FloatingObjectTransmittingBuoyDto extends AbstractFloatingObjectTransmittingBuoyDto { +public class FloatingObjectTransmittingBuoyDto extends GeneratedFloatingObjectTransmittingBuoyDto { private static final long serialVersionUID = 7148959059263172961L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java index f71118a..c1e40b6 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/GearUseFeaturesMeasurementSeineDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.seine; * #L% */ -public class GearUseFeaturesMeasurementSeineDto extends AbstractGearUseFeaturesMeasurementSeineDto { +public class GearUseFeaturesMeasurementSeineDto extends GeneratedGearUseFeaturesMeasurementSeineDto { private static final long serialVersionUID = 3690474929450804018L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java index ed86e13..f5681a6 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.dto.seine; */ import com.google.common.collect.Iterables; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -31,7 +31,7 @@ import org.nuiton.util.DateUtil; import java.util.Date; import java.util.Objects; -public class RouteDto extends AbstractRouteDto { +public class RouteDto extends GeneratedRouteDto { private static final Log log = LogFactory.getLog(RouteDto.class); @@ -39,7 +39,7 @@ public class RouteDto extends AbstractRouteDto { public boolean isActivityFindDeVeilleFound() { int position = Iterables.indexOf(getActivitySeine(), - ActivitySeineStubDtos.newActivityFinDeVeillePredicate(true)::test); + ActivitySeineStubHelper.newActivityFinDeVeillePredicate(true)::test); return position >= 0; } @@ -62,7 +62,7 @@ public class RouteDto extends AbstractRouteDto { if (activitySeineId != null) { - int currentPosition = Iterables.indexOf(getActivitySeine(), IdDtos.newIdPredicate(activitySeineId)::test); + int currentPosition = Iterables.indexOf(getActivitySeine(), IdHelper.newIdPredicate(activitySeineId)::test); if (currentPosition >= 1) { previous = Iterables.get(getActivitySeine(), currentPosition - 1); } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java index cef536c..abe4396 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/SetSeineDto.java @@ -26,7 +26,7 @@ import org.nuiton.util.DateUtil; import java.util.Date; -public class SetSeineDto extends AbstractSetSeineDto { +public class SetSeineDto extends GeneratedSetSeineDto { private static final long serialVersionUID = 3546973062604141414L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchHelper.java similarity index 94% rename from services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchHelper.java index bb8d7c0..7786ae4 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchHelper.java @@ -29,7 +29,7 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -public class TargetCatchDtos extends AbstractTargetCatchDtos { +public class TargetCatchHelper extends GeneratedTargetCatchHelper { public static List<TargetCatchDto> filterDiscarded(Collection<TargetCatchDto> source, boolean discardedFilter) { return source.stream() @@ -50,7 +50,7 @@ public class TargetCatchDtos extends AbstractTargetCatchDtos { // If not, you will probably end up with an empty value in the reasonForDiscard field within the ui when you select another row // in the table. ReferentialReference<ReasonForDiscardDto> reasonForDiscard = source.reasonForDiscard; - AbstractTargetCatchDtos.copyTargetCatchDto(source, target); + GeneratedTargetCatchHelper.copyTargetCatchDto(source, target); target.setReasonForDiscard(reasonForDiscard); } } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java index 48af638..96e2507 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto.seine; import org.nuiton.util.NumberUtil; -public class TargetLengthDto extends AbstractTargetLengthDto { +public class TargetLengthDto extends GeneratedTargetLengthDto { private static final long serialVersionUID = 7005688292510741559L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java index 8c27ba5..05185fb 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java @@ -23,27 +23,27 @@ package fr.ird.observe.services.dto.seine; */ import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import java.util.Date; import java.util.Optional; import java.util.function.Predicate; -public class TripSeineDto extends AbstractTripSeineDto { +public class TripSeineDto extends GeneratedTripSeineDto { private static final long serialVersionUID = 3976788848141361507L; public boolean isDateAvailable(String routeId, Date date) { - Predicate<RouteStubDto> routeStubDtoPredicate = RouteStubDtos.newDatePredicate(date); - Predicate<IdDto> idDtoPredicate = IdDtos.newIdPredicate(routeId); + Predicate<RouteStubDto> routeStubDtoPredicate = RouteStubHelper.newDatePredicate(date); + Predicate<IdDto> idDtoPredicate = IdHelper.newIdPredicate(routeId); Optional<RouteStubDto> optional = getRoute().stream() .filter(r -> routeStubDtoPredicate.test(r) && !idDtoPredicate.test(r)) .findFirst(); // Optional<RouteStubDto> optional = Iterables.tryFind(getRoute(), // Predicates.and(RouteStubDtos.newDatePredicate(date), -// Predicates.not(IdDtos.newIdPredicate(routeId)))); +// Predicates.not(IdHelper.newIdPredicate(routeId)))); return !optional.isPresent(); } diff --git a/services-dto/src/main/xmi/observe-services-dto.ini b/services-dto/src/main/xmi/observe-services-dto.ini index 72bea18..4c2a453 100644 --- a/services-dto/src/main/xmi/observe-services-dto.ini +++ b/services-dto/src/main/xmi/observe-services-dto.ini @@ -1,9 +1,8 @@ [model] java8 = true -simpleBeanWithNoInterfaceClassNameSuffix = Dto -simpleBeanWithNoInterfaceDefaultsClassNameSuffix = Dtos -simpleBeanWithNoInterfaceSuperClass = fr.ird.observe.services.dto.AbstractObserveDto -version = 5.0 +classNameSuffix = Dto +superClass = fr.ird.observe.services.dto.AbstractObserveDto +version = @observe.model.version@ [package fr.ird.observe.services.dto] bean = true diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java index 0b9e8c2..157cb14 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.rest.service.seine; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -74,7 +74,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { //FIXME // Assert.assertEquals(2, tripSeineGearUseDto.sizeGearUseFeaturesSeine()); // -// GearUseFeaturesSeineDto feature1 = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); +// GearUseFeaturesSeineDto feature1 = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdHelper.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); // // Assert.assertEquals(GEAR_USE_FEATURES_SEINE_ID_1, feature1.getId()); // Assert.assertEquals("fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25", feature1.getGear().getId()); @@ -83,21 +83,21 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { // Assert.assertEquals(Boolean.TRUE, feature1.getUsedInTrip()); // Assert.assertEquals(3, feature1.sizeGearUseFeaturesMeasurement()); // -// GearUseFeaturesMeasurementSeineDto measurement1 = IdDtos.findById( +// GearUseFeaturesMeasurementSeineDto measurement1 = IdHelper.findById( // feature1.getGearUseFeaturesMeasurement(), // "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230663#0.8598592739610341"); // Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20", measurement1.getGearCaracteristic().getId()); // Assert.assertEquals("3", measurement1.getMeasurementValue()); // // -// GearUseFeaturesMeasurementSeineDto measurement2 = IdDtos.findById( +// GearUseFeaturesMeasurementSeineDto measurement2 = IdHelper.findById( // feature1.getGearUseFeaturesMeasurement(), // "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230664#0.3389960469962563"); // Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21", measurement2.getGearCaracteristic().getId()); // Assert.assertEquals("true", measurement2.getMeasurementValue()); // // -// GearUseFeaturesMeasurementSeineDto measurement3 = IdDtos.findById( +// GearUseFeaturesMeasurementSeineDto measurement3 = IdHelper.findById( // feature1.getGearUseFeaturesMeasurement(), // "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230665#0.018683933154531762"); // Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22", measurement3.getGearCaracteristic().getId()); @@ -140,7 +140,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { // Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineGearUseDto.getId()); // Assert.assertEquals(2, tripSeineGearUseDto.sizeGearUseFeaturesSeine()); // -// GearUseFeaturesSeineDto feature1 = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); +// GearUseFeaturesSeineDto feature1 = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdHelper.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); // // Assert.assertEquals(GEAR_USE_FEATURES_SEINE_ID_1, feature1.getId()); // Assert.assertEquals("fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25", feature1.getGear().getId()); @@ -149,21 +149,21 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { // Assert.assertEquals(Boolean.TRUE, feature1.getUsedInTrip()); // Assert.assertEquals(3, feature1.sizeGearUseFeaturesMeasurement()); // -// GearUseFeaturesMeasurementSeineDto measurement1 = IdDtos.findById( +// GearUseFeaturesMeasurementSeineDto measurement1 = IdHelper.findById( // feature1.getGearUseFeaturesMeasurement(), // "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230663#0.8598592739610341"); // Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20", measurement1.getGearCaracteristic().getId()); // Assert.assertEquals("3", measurement1.getMeasurementValue()); // // -// GearUseFeaturesMeasurementSeineDto measurement2 = IdDtos.findById( +// GearUseFeaturesMeasurementSeineDto measurement2 = IdHelper.findById( // feature1.getGearUseFeaturesMeasurement(), // "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230664#0.3389960469962563"); // Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21", measurement2.getGearCaracteristic().getId()); // Assert.assertEquals("true", measurement2.getMeasurementValue()); // // -// GearUseFeaturesMeasurementSeineDto measurement3 = IdDtos.findById( +// GearUseFeaturesMeasurementSeineDto measurement3 = IdHelper.findById( // feature1.getGearUseFeaturesMeasurement(), // "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230665#0.018683933154531762"); // Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22", measurement3.getGearCaracteristic().getId()); @@ -194,7 +194,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { GearUseFeaturesSeineDto featuresSeineDto = tripSeineGearUseDto.getGearUseFeaturesSeine() .stream() - .filter(IdDtos.newIdPredicate(ObserveFixtures.GEAR_USE_FEATURES_SEINE_ID_1)) + .filter(IdHelper.newIdPredicate(ObserveFixtures.GEAR_USE_FEATURES_SEINE_ID_1)) .findFirst() .get(); @@ -218,7 +218,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { GearUseFeaturesSeineDto feature1 = tripSeineGearUseDto.getGearUseFeaturesSeine() .stream() - .filter(IdDtos.newIdPredicate(ObserveFixtures.GEAR_USE_FEATURES_SEINE_ID_1)) + .filter(IdHelper.newIdPredicate(ObserveFixtures.GEAR_USE_FEATURES_SEINE_ID_1)) .findFirst() .get(); @@ -231,21 +231,21 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { Assert.assertEquals(3, feature1.sizeGearUseFeaturesMeasurement()); Assert.assertEquals("Un Commentaire", feature1.getComment()); - GearUseFeaturesMeasurementSeineDto measurement1 = IdDtos.findById( + GearUseFeaturesMeasurementSeineDto measurement1 = IdHelper.findById( feature1.getGearUseFeaturesMeasurement(), "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230663#0.8598592739610341"); Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20", measurement1.getGearCaracteristic().getId()); Assert.assertEquals("4", measurement1.getMeasurementValue()); - GearUseFeaturesMeasurementSeineDto measurement2 = IdDtos.findById( + GearUseFeaturesMeasurementSeineDto measurement2 = IdHelper.findById( feature1.getGearUseFeaturesMeasurement(), "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230664#0.3389960469962563"); Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21", measurement2.getGearCaracteristic().getId()); Assert.assertEquals("false", measurement2.getMeasurementValue()); - GearUseFeaturesMeasurementSeineDto measurement3 = IdDtos.findById( + GearUseFeaturesMeasurementSeineDto measurement3 = IdHelper.findById( feature1.getGearUseFeaturesMeasurement(), "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230665#0.018683933154531762"); Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22", measurement3.getGearCaracteristic().getId()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java index 4b257f9..a64e9d1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java @@ -26,7 +26,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import fr.ird.observe.entities.Entities; import fr.ird.observe.services.dto.ObserveDbUserDto; -import fr.ird.observe.services.dto.ObserveDbUserDtos; +import fr.ird.observe.services.dto.ObserveDbUserHelper; import fr.ird.observe.services.dto.constants.ObserveDbRole; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; @@ -204,8 +204,8 @@ public class ObserveSecurityHelper { } protected List<String> getUserNamesByRole(Set<ObserveDbUserDto> users, ObserveDbRole role) { - return users.stream().filter(ObserveDbUserDtos.newRolePredicate(role)).map(ObserveDbUserDtos.NAME_FUNCTION).collect(Collectors.toList()); -// return Iterables.transform(Iterables.filter(users, ObserveDbUserDtos.newRolePredicate(role)), ObserveDbUserDtos.NAME_FUNCTION::apply); + return users.stream().filter(ObserveDbUserHelper.newRolePredicate(role)).map(ObserveDbUserHelper.NAME_FUNCTION).collect(Collectors.toList()); +// return Iterables.transform(Iterables.filter(users, ObserveDbUserHelper.newRolePredicate(role)), ObserveDbUserHelper.NAME_FUNCTION::apply); } protected Set<String> escapedNames(List<String> names) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java index b7fa47c..257f305 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java @@ -43,7 +43,7 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; +import fr.ird.observe.services.dto.result.SaveResultHelper; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DataNotFoundException; import org.apache.commons.logging.Log; @@ -163,7 +163,7 @@ public abstract class ObserveServiceTopia implements ObserveService { getTopiaPersistenceContext().updateLastUpdateDate(entity, lastUpdateDate); - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return SaveResultHelper.of(entity.getTopiaId(), lastUpdateDate); } @@ -176,7 +176,7 @@ public abstract class ObserveServiceTopia implements ObserveService { persistenceContext.updateLastUpdateDate(parenEntity, lastUpdateDate); persistenceContext.updateLastUpdateDate(entity, lastUpdateDate); - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return SaveResultHelper.of(entity.getTopiaId(), lastUpdateDate); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java index da930e1..9988e9b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java @@ -34,6 +34,7 @@ import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPers import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.I18nReferentialEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.services.dto.referential.I18nReferentialHelper; import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.GearType; @@ -45,7 +46,6 @@ import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.SchoolType; import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.referential.I18nReferentialDto; -import fr.ird.observe.services.dto.referential.I18nReferentialDtos; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import org.apache.commons.collections4.CollectionUtils; @@ -205,7 +205,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { } protected String getLabel(ReferentialLocale locale, I18nReferentialDto dto) { - return I18nReferentialDtos.decorate(locale.ordinal(), dto); + return I18nReferentialHelper.decorate(locale.ordinal(), dto); } protected String getLabel(ReferentialLocale locale, ReferentialReference dto) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java index f033104..a69e022 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; -import fr.ird.observe.services.dto.referential.PersonDtos; +import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; @@ -115,7 +115,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong dto.getStartDate(), dto.getEndDate(), getLabel(referentialLocale, dto.getVessel()), - PersonDtos.getNames(dto.getObserver())); + PersonHelper.getNames(dto.getObserver())); } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java index 3708403..b861ce6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java @@ -34,7 +34,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; -import fr.ird.observe.services.dto.referential.PersonDtos; +import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.RouteStubDto; @@ -116,7 +116,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> dto.getStartDate(), dto.getEndDate(), getLabel(referentialLocale, dto.getVessel()), - PersonDtos.getNames(dto.getObserver())); + PersonHelper.getNames(dto.getObserver())); } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java index 87bfc4b..be8e399 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java @@ -43,7 +43,7 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; -import fr.ird.observe.services.dto.ObserveDbUserDtos; +import fr.ird.observe.services.dto.ObserveDbUserHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.BabModelVersionException; @@ -518,7 +518,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS @Override public void applySecurity(ObserveDataSourceConfiguration dataSourceConfiguration, Set<ObserveDbUserDto> users) { if (log.isTraceEnabled()) { - log.trace("applySecurity(" + dataSourceConfiguration + ", [" + Joiner.on(", ").join(users.stream().map(ObserveDbUserDtos.NAME_FUNCTION).collect(Collectors.toList())) + "])"); + log.trace("applySecurity(" + dataSourceConfiguration + ", [" + Joiner.on(", ").join(users.stream().map(ObserveDbUserHelper.NAME_FUNCTION).collect(Collectors.toList())) + "])"); } // pas de securité pour les bases autres que postgresql diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java index da44911..31eaf02 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java @@ -33,7 +33,7 @@ import fr.ird.observe.services.service.trip.ImportTripResult; import fr.ird.observe.services.service.trip.TripManagementService; import fr.ird.observe.services.topia.ObserveServiceContextTopia; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.service.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.AddSqlScriptProducerResult; import fr.ird.observe.services.service.DeleteSqlScriptProducerRequest; @@ -178,7 +178,7 @@ public class TripManagementServiceTopia extends ObserveServiceTopia implements T long t0 = System.nanoTime(); - boolean isTripSeineId = IdDtos.isTripSeineId(tripId); + boolean isTripSeineId = IdHelper.isTripSeineId(tripId); boolean deleted = (isTripSeineId && tripSeineIds.contains(tripId)) || tripLonglineIds.contains(tripId); if (deleted) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java index 56e98a1..c026c66 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; -import fr.ird.observe.services.dto.result.TripChildSaveResultDtos; +import fr.ird.observe.services.dto.result.TripChildSaveResultHelper; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.services.topia.ObserveServiceTopia; @@ -182,7 +182,7 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements SaveResultDto saveResultDto = saveEntity(entity); - TripChildSaveResultDto result = TripChildSaveResultDtos.of(saveResultDto); + TripChildSaveResultDto result = TripChildSaveResultHelper.of(saveResultDto); if (dto.isNotPersisted()) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java index 456259c..742f253 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java @@ -42,7 +42,7 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; -import fr.ird.observe.services.dto.result.TripChildSaveResultDtos; +import fr.ird.observe.services.dto.result.TripChildSaveResultHelper; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -222,7 +222,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi SaveResultDto saveResultDto = saveEntity(entity); - TripChildSaveResultDto result = TripChildSaveResultDtos.of(saveResultDto); + TripChildSaveResultDto result = TripChildSaveResultHelper.of(saveResultDto); if (dto.isNotPersisted()) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java index 2fdbfad..aef543c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReferences; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; -import fr.ird.observe.services.dto.seine.TargetCatchDtos; +import fr.ird.observe.services.dto.seine.TargetCatchHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -73,7 +73,7 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ // on filtre les captures pour ne garder que les conservées ou les rejetées Collection<TargetCatchDto> allTargetCatchDtos = setSeineTargetCatchDto.getTargetCatch(); - List<TargetCatchDto> targetCatchDtos = TargetCatchDtos.filterDiscarded(allTargetCatchDtos, discarded); + List<TargetCatchDto> targetCatchDtos = TargetCatchHelper.filterDiscarded(allTargetCatchDtos, discarded); setSeineTargetCatchDto.setTargetCatch(targetCatchDtos); @@ -114,7 +114,7 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ // On conserve les identifiants des espèces utilisables dans les échantillons Set<String> speciesIds = dto.getTargetCatch().stream() - .map(TargetCatchDtos.SPECIES_FUNCTION) + .map(TargetCatchHelper.SPECIES_FUNCTION) .map(ReferentialReferences.ID_FUNCTION) .collect(Collectors.toSet()); diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java index f2c6a24..76432f7 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; @@ -77,7 +77,7 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { GearUseFeaturesSeine featuresSeine = tripSeine.getGearUseFeaturesSeineByTopiaId(ObserveFixtures.GEAR_USE_FEATURES_SEINE_ID); GearUseFeaturesSeineDto featuresSeineDto = tripSeineGearUseDto.getGearUseFeaturesSeine() .stream() - .filter(IdDtos.newIdPredicate(ObserveFixtures.GEAR_USE_FEATURES_SEINE_ID)) + .filter(IdHelper.newIdPredicate(ObserveFixtures.GEAR_USE_FEATURES_SEINE_ID)) .findFirst() .get(); @@ -124,7 +124,7 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { GearUseFeaturesSeineDto gearUseFeaturesSeineDto = tripSeineGearUseDto.getGearUseFeaturesSeine() .stream() - .filter(IdDtos.newIdPredicate(ObserveFixtures.GEAR_USE_FEATURES_SEINE_ID)) + .filter(IdHelper.newIdPredicate(ObserveFixtures.GEAR_USE_FEATURES_SEINE_ID)) .findFirst() .get(); diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoHelper.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoHelper.java index 73f20e6..ac0ef87 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtos.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoHelper.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ValidateResultForDtos { +public class ValidateResultForDtoHelper { public static EnumMap<NuitonValidatorScope, Integer> getScopesCount(ValidateResultForDto<?> validateResultForDto) { diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorHelper.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java rename to services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorHelper.java index 3444dbc..342b55e 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorDtos.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorHelper.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ValidatorDtos { +public class ValidatorHelper { public static Set<ValidatorDto> filter(Set<ValidatorDto> validators, boolean validateData, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm