branch feature/7586 updated (d4e5353 -> 54f7e07)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git from d4e5353 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) new fe0a577 chargement des triplonglines (refs #7586) new 54f7e07 fix decorator(refs #7586) The 2 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 54f7e07ed265ede21edc01962a5e20616276cdc4 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 16:00:38 2015 +0200 fix decorator(refs #7586) commit fe0a5771f418e9a28b35eb892b35da0054c6481a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 15:44:22 2015 +0200 chargement des triplonglines (refs #7586) Summary of changes: .../observe/ObserveSwingApplicationContext.java | 10 +- .../java/fr/ird/observe/ui/DecoratorService.java | 122 ++++++++++----------- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../ui/storage/tabs/DataSelectionModel.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 22 ++-- .../v1/longline/TripLonglineServiceController.java | 5 +- .../service/longline/TripLonglineService.java | 3 +- .../service/longline/TripLonglineServiceTopia.java | 29 +++-- 8 files changed, 100 insertions(+), 103 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git commit fe0a5771f418e9a28b35eb892b35da0054c6481a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 15:44:22 2015 +0200 chargement des triplonglines (refs #7586) --- .../observe/ObserveSwingApplicationContext.java | 10 ++++---- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +++----- .../ui/storage/tabs/DataSelectionModel.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 22 +++++++++------- .../v1/longline/TripLonglineServiceController.java | 5 ++-- .../service/longline/TripLonglineService.java | 3 +-- .../service/longline/TripLonglineServiceTopia.java | 29 +++++++++++----------- 7 files changed, 40 insertions(+), 41 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 98888d7..cc513f3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -40,7 +40,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; +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.seine.TripSeineDto; @@ -753,11 +753,11 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { } } else if (ProgramDtos.isProgramLongline(programDtoRef)) { - ReferenceSetDto<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); + ReferenceSetDto<TripLonglineDto> tripLonglines = tripLonglineService.getTripLonglineByProgram(programDtoRef.getId()); for (ReferenceDto tripLongline : tripLonglines.getReference()) { - log.info(" - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_VESSEL_LABEL) - + " " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_START_DATE) - + " - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_END_DATE)); + log.info(" - " + tripLongline.getPropertyValue(TripLonglineDto.PROPERTY_VESSEL) + + " " + tripLongline.getPropertyValue(TripLonglineDto.PROPERTY_START_DATE) + + " - " + tripLongline.getPropertyValue(TripLonglineDto.PROPERTY_END_DATE)); } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index c8d343c..937e623 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -26,11 +26,9 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramDtos; import fr.ird.observe.services.service.ReferentialService; @@ -102,19 +100,19 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri protected List<ReferenceDto> getChilds(ProgramDto bean) { TripLonglineService service = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); - ReferenceSetDto<TripLonglineStubDto> tripLonglineStubByProgram = service.getTripLonglineStubByProgram(bean.getId()); + ReferenceSetDto<TripLonglineDto> tripLonglineByProgram = service.getTripLonglineByProgram(bean.getId()); if (log.isDebugEnabled()) { - log.debug("Will use " + tripLonglineStubByProgram.sizeReference() + " trips."); + log.debug("Will use " + tripLonglineByProgram.sizeReference() + " trips."); } - return new ArrayList<>(tripLonglineStubByProgram.getReference()); + return new ArrayList<>(tripLonglineByProgram.getReference()); } @Override protected void loadParentBean() { ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - FormDto<ProgramDto> programDtoFormDto = service.loadToEdit(ProgramDto.class, getSelectedParentId()); + FormDto<ProgramDto> programDtoFormDto = service.loadToRead(ProgramDto.class, getSelectedParentId()); getModel().setFormDto(programDtoFormDto); ProgramDtos.copyProgramDto(programDtoFormDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java index 2d9ee1d..354003c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java @@ -81,7 +81,7 @@ public class DataSelectionModel implements Serializable { } else if (ProgramDtos.isProgramLongline(program)) { - referenceDtos.addAll(tripLonglineService.getTripLonglineStubByProgram(program.getId()).getReference()); + referenceDtos.addAll(tripLonglineService.getTripLonglineByProgram(program.getId()).getReference()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 19856f8..4dfb61f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -22,14 +22,20 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripLonglineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -100,11 +106,10 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa // result = service.getTripLonglineStubByProgram(dataSource, parentId); // // } + TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + ReferenceSetDto<TripLonglineDto> tripLonglineByProgram = tripLonglineService.getTripLonglineByProgram(parentId); - //FIXME -// return result; - return null; - + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(tripLonglineByProgram.getReference())); } @Override @@ -121,16 +126,15 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa { // Add gears //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(TripLongline.PROPERTY_GEAR_USE_FEATURES_LONGLINE); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("gearUseFeaturesLongline"); + result.add(child); } { // Add activities //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode( -// TripLongline.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesNodeChildLoador.class); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("activityLongline", ActivityLonglinesNodeChildLoador.class); + result.add(child); } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java index a6f84a7..2f49cc5 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.service.longline.TripLonglineService; /** @@ -40,8 +39,8 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { - return service.getTripLonglineStubByProgram(programId); + public ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId) { + return service.getTripLonglineByProgram(programId); } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java index 542ab5c..92482c6 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; @@ -40,7 +39,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TripLonglineService extends ObserveService { @ReadDataPermission - ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId); + ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId); @ReadDataPermission TripMapDto getTripLonglineMap(String tripLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index 486424d..a618510 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -38,7 +38,6 @@ import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; import org.nuiton.util.DateUtil; @@ -57,36 +56,36 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { + public ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); List<TripLongline> tripLonglines = getDao().findAllStubByProgramId(programId, referenceLocale); - LinkedHashSet<ReferenceDto<TripLonglineStubDto>> stubs = Sets.newLinkedHashSet(); + LinkedHashSet<ReferenceDto<TripLonglineDto>> stubs = Sets.newLinkedHashSet(); for (TripLongline tripLongline : tripLonglines) { - ReferenceDto<TripLonglineStubDto> stub = - ReferenceDtos.newReferenceDto(TripLonglineStubDto.class, - Lists.newArrayList(TripLonglineStubDto.PROPERTY_START_DATE, - TripLonglineStubDto.PROPERTY_END_DATE, - TripLonglineStubDto.PROPERTY_VESSEL_LABEL, - TripLonglineStubDto.PROPERTY_OBSERVER_LABEL)); + ReferenceDto<TripLonglineDto> stub = + ReferenceDtos.newReferenceDto(TripLonglineDto.class, + Lists.newArrayList(TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OBSERVER)); stub.setId(tripLongline.getTopiaId()); - stub.setPropertyValue(TripLonglineStubDto.PROPERTY_START_DATE, tripLongline.getStartDate()); - stub.setPropertyValue(TripLonglineStubDto.PROPERTY_END_DATE, tripLongline.getEndDate()); - stub.setPropertyValue(TripLonglineStubDto.PROPERTY_VESSEL_LABEL, referenceLocale.getLabel(tripLongline.getVessel())); - stub.setPropertyValue(TripLonglineStubDto.PROPERTY_OBSERVER_LABEL, tripLongline.getObserverLabel()); + stub.setPropertyValue(TripLonglineDto.PROPERTY_START_DATE, tripLongline.getStartDate()); + stub.setPropertyValue(TripLonglineDto.PROPERTY_END_DATE, tripLongline.getEndDate()); + stub.setPropertyValue(TripLonglineDto.PROPERTY_VESSEL, referenceLocale.getLabel(tripLongline.getVessel())); + stub.setPropertyValue(TripLonglineDto.PROPERTY_OBSERVER, tripLongline.getObserverLabel()); stubs.add(stub); } Optional<Date> lastUpdateOptional = getLastUpdate(TripLongline.class); - ReferenceSetDto<TripLonglineStubDto> stubReferences = - ReferenceSetDtos.newReferenceSetDto(TripLonglineStubDto.class, stubs, lastUpdateOptional.orNull()); + ReferenceSetDto<TripLonglineDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(TripLonglineDto.class, stubs, lastUpdateOptional.orNull()); return stubReferences; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7586 in repository observe. See http://git.codelutin.com/observe.git commit 54f7e07ed265ede21edc01962a5e20616276cdc4 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 16:00:38 2015 +0200 fix decorator(refs #7586) --- .../java/fr/ird/observe/ui/DecoratorService.java | 122 ++++++++++----------- 1 file changed, 60 insertions(+), 62 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index 6cc81f0..8bb4dd0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -403,7 +403,7 @@ public class DecoratorService extends DecoratorProvider { String libelle = referentialLocale.getLibelle(); registerJXPathDecorator(ProgramDto.class, t("observe.common.program") + - " ${" + libelle + "}$s"); + " ${" + libelle + "}$s"); registerReferenceDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); registerJXPathDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); @@ -412,28 +412,28 @@ public class DecoratorService extends DecoratorProvider { ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s", "##", " - "); - registerReferenceDtoDecorator(ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s"); + registerReferenceDtoDecorator(ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine}$s"); registerMultiJXPathDecorator( ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", "##", " - "); registerReferenceDtoDecorator(ActivityLonglineDto.class, - "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s"); + "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline}$s"); registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); registerReferenceDtoDecorator(PersonDto.class, "${lastName}$s##${firstName}$s"); - registerDefaultReferenceDtoDecorator(SexDto.class, libelle); + registerDefaultReferenceDtoDecorator(SexDto.class); //FIXME Use startDate - endDate - registerDefaultReferenceDtoDecorator(FpaZoneDto.class, libelle); - registerDefaultReferenceDtoDecorator(OceanDto.class, libelle); - registerDefaultReferenceDtoDecorator(DetectionModeDto.class, libelle); - registerDefaultReferenceDtoDecorator(VesselDto.class, libelle); - registerDefaultReferenceDtoDecorator(CountryDto.class, libelle); + registerDefaultReferenceDtoDecorator(FpaZoneDto.class); + registerDefaultReferenceDtoDecorator(OceanDto.class); + registerDefaultReferenceDtoDecorator(DetectionModeDto.class); + registerDefaultReferenceDtoDecorator(VesselDto.class); + registerDefaultReferenceDtoDecorator(CountryDto.class); registerReferenceDtoDecorator(VesselSizeCategoryDto.class, "${code}$s##${gaugeLabel}$s##${capacityLabel}$s"); - registerDefaultReferenceDtoDecorator(VesselTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(VesselActivitySeineDto.class, libelle); - registerDefaultReferenceDtoDecorator(SurroundingActivityDto.class, libelle); - registerDefaultReferenceDtoDecorator(ObservedSystemDto.class, libelle); - registerReferenceDtoDecorator(WindDto.class, "${code}$s##${" + libelle + "}$s##${speedRange}$s"); + registerDefaultReferenceDtoDecorator(VesselTypeDto.class); + registerDefaultReferenceDtoDecorator(VesselActivitySeineDto.class); + registerDefaultReferenceDtoDecorator(SurroundingActivityDto.class); + registerDefaultReferenceDtoDecorator(ObservedSystemDto.class); + registerReferenceDtoDecorator(WindDto.class, "${code}$s##${label}$s##${speedRange}$s"); registerMultiJXPathDecorator( FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); @@ -442,49 +442,49 @@ public class DecoratorService extends DecoratorProvider { registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this registerJXPathDecorator(SetLonglineDto.class, t("observe.common.setLongline")); - registerDefaultReferenceDtoDecorator(ObjectFateDto.class, libelle); - registerDefaultReferenceDtoDecorator(OrganismDto.class, libelle); - registerDefaultReferenceDtoDecorator(ObjectTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(ObjectOperationDto.class, libelle); - registerDefaultReferenceDtoDecorator(SpeciesStatusDto.class, libelle); - registerDefaultReferenceDtoDecorator(TransmittingBuoyTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(TransmittingBuoyOperationDto.class, libelle); - registerDefaultReferenceDtoDecorator(ReasonForNullSetDto.class, libelle); - registerDefaultReferenceDtoDecorator(ReasonForNoFishingDto.class, libelle); - registerDefaultReferenceDtoDecorator(WeightCategoryDto.class, libelle); - registerDefaultReferenceDtoDecorator(ReasonForDiscardDto.class, libelle); - registerDefaultReferenceDtoDecorator(SpeciesFateDto.class, libelle); - registerDefaultReferenceDtoDecorator(SpeciesGroupDto.class, libelle); - registerDefaultReferenceDtoDecorator(SpeciesListDto.class, libelle); - - registerDefaultReferenceDtoDecorator(BaitHaulingStatusDto.class, libelle); - registerDefaultReferenceDtoDecorator(BaitSettingStatusDto.class, libelle); - registerDefaultReferenceDtoDecorator(BaitTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(CatchFateLonglineDto.class, libelle); - registerDefaultReferenceDtoDecorator(EncounterTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(HealthnessDto.class, libelle); - registerDefaultReferenceDtoDecorator(HookPositionDto.class, libelle); - registerDefaultReferenceDtoDecorator(HookSizeDto.class, libelle); - registerDefaultReferenceDtoDecorator(HookTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(ItemVerticalPositionDto.class, libelle); - registerDefaultReferenceDtoDecorator(ItemHorizontalPositionDto.class, libelle); - registerDefaultReferenceDtoDecorator(LightsticksColorDto.class, libelle); - registerDefaultReferenceDtoDecorator(LightsticksTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(LineTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(MaturityStatusDto.class, libelle); - registerDefaultReferenceDtoDecorator(MitigationTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObjectFateDto.class); + registerDefaultReferenceDtoDecorator(OrganismDto.class); + registerDefaultReferenceDtoDecorator(ObjectTypeDto.class); + registerDefaultReferenceDtoDecorator(ObjectOperationDto.class); + registerDefaultReferenceDtoDecorator(SpeciesStatusDto.class); + registerDefaultReferenceDtoDecorator(TransmittingBuoyTypeDto.class); + registerDefaultReferenceDtoDecorator(TransmittingBuoyOperationDto.class); + registerDefaultReferenceDtoDecorator(ReasonForNullSetDto.class); + registerDefaultReferenceDtoDecorator(ReasonForNoFishingDto.class); + registerDefaultReferenceDtoDecorator(WeightCategoryDto.class); + registerDefaultReferenceDtoDecorator(ReasonForDiscardDto.class); + registerDefaultReferenceDtoDecorator(SpeciesFateDto.class); + registerDefaultReferenceDtoDecorator(SpeciesGroupDto.class); + registerDefaultReferenceDtoDecorator(SpeciesListDto.class); + + registerDefaultReferenceDtoDecorator(BaitHaulingStatusDto.class); + registerDefaultReferenceDtoDecorator(BaitSettingStatusDto.class); + registerDefaultReferenceDtoDecorator(BaitTypeDto.class); + registerDefaultReferenceDtoDecorator(CatchFateLonglineDto.class); + registerDefaultReferenceDtoDecorator(EncounterTypeDto.class); + registerDefaultReferenceDtoDecorator(HealthnessDto.class); + registerDefaultReferenceDtoDecorator(HookPositionDto.class); + registerDefaultReferenceDtoDecorator(HookSizeDto.class); + registerDefaultReferenceDtoDecorator(HookTypeDto.class); + registerDefaultReferenceDtoDecorator(ItemVerticalPositionDto.class); + registerDefaultReferenceDtoDecorator(ItemHorizontalPositionDto.class); + registerDefaultReferenceDtoDecorator(LightsticksColorDto.class); + registerDefaultReferenceDtoDecorator(LightsticksTypeDto.class); + registerDefaultReferenceDtoDecorator(LineTypeDto.class); + registerDefaultReferenceDtoDecorator(MaturityStatusDto.class); + registerDefaultReferenceDtoDecorator(MitigationTypeDto.class); registerReferenceDtoDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); - registerDefaultReferenceDtoDecorator(SensorDataFormatDto.class, libelle); - registerDefaultReferenceDtoDecorator(SensorTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(SettingShapeDto.class, libelle); - registerDefaultReferenceDtoDecorator(SizeMeasureTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(StomacFullnessDto.class, libelle); - registerDefaultReferenceDtoDecorator(TripTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(VesselActivityLonglineDto.class, libelle); - registerDefaultReferenceDtoDecorator(WeightMeasureTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(GearCaracteristicTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(GearCaracteristicDto.class, libelle); - registerDefaultReferenceDtoDecorator(GearDto.class, libelle); + registerDefaultReferenceDtoDecorator(SensorDataFormatDto.class); + registerDefaultReferenceDtoDecorator(SensorTypeDto.class); + registerDefaultReferenceDtoDecorator(SettingShapeDto.class); + registerDefaultReferenceDtoDecorator(SizeMeasureTypeDto.class); + registerDefaultReferenceDtoDecorator(StomacFullnessDto.class); + registerDefaultReferenceDtoDecorator(TripTypeDto.class); + registerDefaultReferenceDtoDecorator(VesselActivityLonglineDto.class); + registerDefaultReferenceDtoDecorator(WeightMeasureTypeDto.class); + registerDefaultReferenceDtoDecorator(GearCaracteristicTypeDto.class); + registerDefaultReferenceDtoDecorator(GearCaracteristicDto.class); + registerDefaultReferenceDtoDecorator(GearDto.class); registerReferenceDtoDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); @@ -529,15 +529,13 @@ public class DecoratorService extends DecoratorProvider { // TripSeine decorator registerDecorator(new TripSeineDecorator(libelle)); registerReferenceDtoDecorator(TripSeineDto.class, - "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" - + libelle + "}$s##${observerLabel}$s"); + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel}$s##${observer}$s"); // TripLongline decorator registerDecorator(new TripLonglineDecorator(libelle)); registerReferenceDtoDecorator(TripLonglineDto.class, - "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" - + libelle + "}$s##${observerLabel}$s"); + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel}$s##${observer}$s"); String oldCode = l(locale, "observe.common.oldCode3L"); // Species decorator @@ -577,8 +575,8 @@ public class DecoratorService extends DecoratorProvider { } - protected <T extends IdDto> void registerDefaultReferenceDtoDecorator(Class<T> referenceType, String libelle) { - registerReferenceDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); + protected <T extends IdDto> void registerDefaultReferenceDtoDecorator(Class<T> referenceType) { + registerReferenceDtoDecorator(referenceType, "${code}$s##${label}$s"); } protected <T extends IdDto> void registerReferenceDtoDecorator(Class<T> referenceType, String expression) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm