This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 33e0b828c07990542c50f3b3a22667350ec73456 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 23:14:42 2015 +0100 Ajout d'un message sur l'exception --- .../fr/ird/observe/services/dto/ReferenceSetNotFoundException.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetNotFoundException.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetNotFoundException.java index 5694ce9..328c614 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetNotFoundException.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetNotFoundException.java @@ -54,4 +54,9 @@ public class ReferenceSetNotFoundException extends RuntimeException { public String getName() { return name; } + + @Override + public String getMessage() { + return String.format("Could not find referenceSet %s (type: %s)", name, dtoType.getSimpleName()); + } } -- 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/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 8f0094f83f87a934427057b889849a7adeeeb4ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 23:16:22 2015 +0100 recharger les ensembles de références à l'ouverture d'un écran de type table --- .../java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index 026074e..dd10b91 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -248,7 +248,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM_DTO, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - updateReferenceSets(false); + updateReferenceSets(true); } }); -- 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/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 2d620b818612f297c7c4cb2ab6aa11734fb78b40 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 21 08:12:26 2015 +0100 Impact du changement de l'API des services sur l'implatantion webmotion --- .../services/service/seine/TripSeineGearUseServiceRestTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java index 93df71e..f2bd135 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java @@ -127,7 +127,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { Map<String, ReferenceDto<TripSeineDto>> tripIds = IdDtos.splitById(allTripSeine.getReference()); Assume.assumeTrue("Marée " + TRIP_SEINE_ID_1 + " non trouvée dans cette base. Test annulé", tripIds.containsKey(TRIP_SEINE_ID_1)); - FormDto<TripSeineGearUseDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); + FormDto<TripSeineGearUseDto> formDto = service.loadForm(TRIP_SEINE_ID_1); Assert.assertNotNull(formDto); //FIXME @@ -189,7 +189,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { @Ignore @Test public void saveUpdateTest() { - FormDto<TripSeineGearUseDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); + FormDto<TripSeineGearUseDto> formDto = service.loadForm(TRIP_SEINE_ID_1); TripSeineGearUseDto tripSeineGearUseDto = formDto.getForm(); @@ -209,7 +209,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { service.save(tripSeineGearUseDto); - FormDto<TripSeineGearUseDto> formDtoAfterSave = service.loadToEdit(TRIP_SEINE_ID_1); + FormDto<TripSeineGearUseDto> formDtoAfterSave = service.loadForm(TRIP_SEINE_ID_1); tripSeineGearUseDto = formDtoAfterSave.getForm(); -- 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/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 6b02894cab1b057adb9d7ba117287b9836077372 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 21 08:16:56 2015 +0100 Ajout propriétés sur le FormDto, revue du constructeur et de l'adapter json (on ne deserialise plus les labels qui de toute façon seront supprimés au prochain wagon...) --- .../main/java/fr/ird/observe/services/dto/FormDto.java | 4 ++++ .../java/fr/ird/observe/services/dto/FormDtos.java | 18 ++++++++---------- .../ird/observe/services/dto/gson/FormDtoAdapter.java | 12 ++++-------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java index 2e12be5..1bd49ae 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java @@ -37,6 +37,10 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { public static final String PROPERTY_FORM = "form"; + public static final String PROPERTY_REFERENTIAL_REFERENCE_SET_REQUEST_NAME = "referentialReferenceSetRequestName"; + + public static final String PROPERTY_DATA_REFERENCE_SET_REQUEST_NAME = "dataReferenceSetRequestName"; + protected final Class<R> type; protected R form; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java index d551993..8ac4ed4 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java @@ -22,8 +22,6 @@ package fr.ird.observe.services.dto; * #L% */ -import java.util.Collection; - /** * Created on 17/08/15. * @@ -31,16 +29,16 @@ import java.util.Collection; */ public class FormDtos extends AbstractFormDtos { - public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source) { - BeanType result = (BeanType) new FormDto<>(source); - return result; - } - - public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source, R form, Collection<ReferenceSetDto> labels) { - BeanType result = (BeanType) new FormDto<>(source); + public static <R extends IdDto> FormDto<R> newFormDto(Class<R> source, + R form, + String referentialRequestDefinitionName, + String dataRequestDefinitionName) { + FormDto<R> result = new FormDto<>(source); result.setForm(form); - result.setLabels(labels); + result.setReferentialReferenceSetRequestName(referentialRequestDefinitionName); + result.setDataReferenceSetRequestName(dataRequestDefinitionName); return result; } + } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java index 67bdc08..d7cacc9 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java @@ -1,6 +1,5 @@ package fr.ird.observe.services.dto.gson; -import com.google.common.collect.Lists; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; @@ -9,29 +8,26 @@ import com.google.gson.JsonParseException; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.FormDtos; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceSetDto; import java.lang.reflect.Type; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class FormDtoAdapter implements JsonDeserializer<FormDto<?>>{ +public class FormDtoAdapter implements JsonDeserializer<FormDto<?>> { @Override public FormDto<?> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { JsonObject jsonObject = json.getAsJsonObject(); Class dtoType = context.deserialize(jsonObject.get(FormDto.PROPERTY_TYPE), Class.class); + String referentialRequestDefinitionName = context.deserialize(jsonObject.get(FormDto.PROPERTY_REFERENTIAL_REFERENCE_SET_REQUEST_NAME), String.class); + String dataRequestDefinitionName = context.deserialize(jsonObject.get(FormDto.PROPERTY_DATA_REFERENCE_SET_REQUEST_NAME), String.class); JsonElement jsonFrom = jsonObject.get(FormDto.PROPERTY_FORM); IdDto form = context.deserialize(jsonFrom, dtoType); - JsonElement jsonLabels = jsonObject.get(FormDto.PROPERTY_LABELS); - - ReferenceSetDto[] labels = context.deserialize(jsonLabels, ReferenceSetDto[].class); - - FormDto<?> formDto = FormDtos.newFormDto(dtoType, form, Lists.newArrayList(labels)); + FormDto<?> formDto = FormDtos.newFormDto(dtoType, form, referentialRequestDefinitionName, dataRequestDefinitionName); return formDto; } -- 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/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit a89286eb4960047b105e0a9683c41b229aa2001e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 21 08:25:58 2015 +0100 Utilisation des requetes dans les formulaires (en fait juste passé le nom de la requete) et ne plus calculer les labels dans le formulaire --- .../ird/observe/services/ObserveServiceTopia.java | 94 +++++----------------- .../services/builder/EntityToDtoBuilder.java | 6 +- .../services/service/ReferentialServiceTopia.java | 10 +-- .../ActivityLongLineEncouterServiceTopia.java | 23 +----- .../ActivityLongLineSensorUsedServiceTopia.java | 29 ++----- .../longline/ActivityLonglineServiceTopia.java | 24 ++---- .../service/longline/BranchlineServiceTopia.java | 37 ++------- .../longline/SetLonglineCatchServiceTopia.java | 50 +----------- .../SetLonglineDetailCompositionServiceTopia.java | 32 +------- .../SetLonglineGlobalCompositionServiceTopia.java | 42 ++-------- .../service/longline/SetLonglineServiceTopia.java | 42 +++++----- .../services/service/longline/TdrServiceTopia.java | 35 ++------ .../longline/TripLonglineGearUseServiceTopia.java | 22 +---- .../service/longline/TripLonglineServiceTopia.java | 39 ++++----- .../ActivitySeineObservedSystemServiceTopia.java | 19 +---- .../service/seine/ActivitySeineServiceTopia.java | 25 ++---- .../service/seine/FloatingObjectServiceTopia.java | 23 +++--- .../service/seine/NonTargetCatchServiceTopia.java | 26 ++---- .../service/seine/NonTargetSampleServiceTopia.java | 29 ++----- .../seine/ObjectObservedSpeciesServiceTopia.java | 26 +----- .../seine/ObjectSchoolEstimateServiceTopia.java | 17 +--- .../services/service/seine/RouteServiceTopia.java | 18 +---- .../service/seine/SchoolEstimateServiceTopia.java | 23 ++---- .../service/seine/SetSeineServiceTopia.java | 23 +++--- .../service/seine/TargetCatchServiceTopia.java | 42 ++-------- .../service/seine/TargetSampleServiceTopia.java | 19 +---- .../TransmittingBuoyOperationServiceTopia.java | 25 +----- .../seine/TripSeineGearUseServiceTopia.java | 22 +---- .../service/seine/TripSeineServiceTopia.java | 25 +++--- 29 files changed, 178 insertions(+), 669 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index e3916d3..dd48a7a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -69,6 +69,7 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -78,7 +79,6 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.entity.EntitiesExtractor; -import fr.ird.observe.services.entity.EntitiesSetFactory; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.DataSourceService; @@ -299,31 +299,6 @@ public abstract class ObserveServiceTopia implements ObserveService { } } - protected <E extends TopiaEntity, D extends IdDto> FormDto<D> entityToReadFormDto(Class<D> dtoType, Class<E> entityType, E entity) { - try (EntityToDtoBuilder<E, D> dtoBuilder = EntityToDtoBuilder.create(entityType, dtoType)) { - - // copy entity - D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity); - - // build label sets detected while copy - // For read form, we don't need to get any values in labelSet (since there is nothing to edit^^) - ImmutableSet.Builder<ReferenceSetDto> labels = ImmutableSet.builder(); - - for (ReferenceTypeName referenceDtoTypeName : dtoBuilder.getReferenceTypesNames()) { - - Class<? extends IdDto> childDtoType = referenceDtoTypeName.getType(); - String propertyName = referenceDtoTypeName.getProperty(); - - labels.add(ReferenceSetDtos.newEmptyReferenceSetDto(childDtoType, propertyName)); - - } - - FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); - return form; - - } - } - protected <E extends TopiaEntity, D extends IdDto> D entityToDto(Class<D> dtoType, Class<E> entityType, E entity) { try (EntityToDtoBuilder<E, D> dtoBuilder = EntityToDtoBuilder.create(entityType, dtoType)) { @@ -337,53 +312,19 @@ public abstract class ObserveServiceTopia implements ObserveService { protected <E extends TopiaEntity, D extends IdDto> FormDto<D> entityToEditFormDto( Class<D> dtoType, - Class<E> entityType, E entity, + ObserveReferenceSetRequestDefinitions referentialRequestDefinition, ReferenceTypeName... includeReferenceDtoTypesNames) { - return entityToEditFormDto(dtoType, entityType, entity, ImmutableMap.<String, Object>of(), includeReferenceDtoTypesNames); - - } - protected <E extends TopiaEntity, D extends IdDto> FormDto<D> entityToEditFormDto( - Class<D> dtoType, - Class<E> entityType, - E entity, - Map<String, Object> dataContext, - ReferenceTypeName... includeReferenceDtoTypesNames) { + Class<E> entityType = getEntityType(dtoType); try (EntityToDtoBuilder<E, D> dtoBuilder = EntityToDtoBuilder.create(entityType, dtoType)) { // copy entity - D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity, includeReferenceDtoTypesNames); - - // build label sets detected while copy - ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); - - EntitiesSetFactory entityFilterFactory = serviceContext.getEntitiesSetFactory(); - - for (ReferenceTypeName referenceDtoTypeName : dtoBuilder.getReferenceTypesNames()) { - - Class<? extends IdDto> childDtoType = referenceDtoTypeName.getType(); - String propertyName = referenceDtoTypeName.getProperty(); - - Class<TopiaEntity> entityParentType = getEntityType(referenceDtoTypeName.getParentType()); - Class<TopiaEntity> entityChildType = getEntityType(childDtoType); - - EntitiesExtractor<TopiaEntity> entitiesExtractor = entityFilterFactory.newEntitiesSet(entityParentType, - entityChildType, - propertyName); - - ReferenceSetDto referenceSet = getReferenceSet(childDtoType, - propertyName, - entityChildType, - entitiesExtractor, - dataContext); - - labels.add(referenceSet); - - } + D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity); - FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); + FormDto<D> form = FormDtos.newFormDto(dtoType, dto, referentialRequestDefinition == null ? null : + referentialRequestDefinition.name(), null); return form; } @@ -562,10 +503,10 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceDto<TripLonglineDto> referenceDto = ReferenceDtos.newReferenceDto(TripLonglineDto.class, - Lists.newArrayList(TripLonglineDto.PROPERTY_START_DATE, - TripLonglineDto.PROPERTY_END_DATE, - TripLonglineDto.PROPERTY_VESSEL, - TripLonglineDto.PROPERTY_OBSERVER)); + Lists.newArrayList(TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OBSERVER)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_START_DATE, entity.getStartDate()); @@ -583,8 +524,8 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceDto<ActivityLonglineDto> referenceDto = ReferenceDtos.newReferenceDto( ActivityLonglineDto.class, Lists.newArrayList(ActivityLonglineDto.PROPERTY_TIME_STAMP, - ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLonglineDto.PROPERTY_SET_LONGLINE)); + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + ActivityLonglineDto.PROPERTY_SET_LONGLINE)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, entity.getTimeStamp()); @@ -601,11 +542,11 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceLocale referenceLocale = getReferenceLocale(); ReferenceDto<TripSeineDto> referenceDto = ReferenceDtos.newReferenceDto(TripSeineDto.class, - Lists.newArrayList(TripSeineDto.PROPERTY_ID, - TripSeineDto.PROPERTY_START_DATE, - TripSeineDto.PROPERTY_END_DATE, - TripSeineDto.PROPERTY_VESSEL, - TripSeineDto.PROPERTY_OBSERVER)); + Lists.newArrayList(TripSeineDto.PROPERTY_ID, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, entity.getStartDate()); referenceDto.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, entity.getEndDate()); @@ -846,6 +787,7 @@ public abstract class ObserveServiceTopia implements ObserveService { return dto; } + protected <E extends TopiaEntity> boolean existsEntity(Class<E> entityType, String id) { ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); TopiaDao<E> dao = persistenceContext.getDao(entityType); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java index 32701b2..389e655 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java @@ -85,17 +85,13 @@ public class EntityToDtoBuilder<E extends TopiaEntity, D extends IdDto> implemen } - public D build(ReferentialLocale referentialLocale, E entity, ReferenceTypeName ... includeReferenceTypesNames) { + public D build(ReferentialLocale referentialLocale, E entity) { Preconditions.checkNotNull(referentialLocale, "'referentialLocale' can't be null."); Preconditions.checkNotNull(entity, "'entity' can't be null."); ImmutableSet.Builder<ReferenceTypeName> referenceTypesBuilder = new ImmutableSet.Builder<>(); - for (ReferenceTypeName includeReferenceDtoType : includeReferenceTypesNames) { - referenceTypesBuilder.add(includeReferenceDtoType); - } - Map<String, Object> entityProperties = binder.obtainProperties(entity, true); ImmutableMap.Builder<String, Object> dtoPropertiesBuilder = new ImmutableMap.Builder<>(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 3d7d59a..1f1e972 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -93,7 +93,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> FormDto<D> loadToRead(Class<D> dtoType, String id) { Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = loadEntity(dtoType, entityType, id); - FormDto<D> form = entityToReadFormDto(dtoType, entityType, entity); + FormDto<D> form = entityToEditFormDto(dtoType, entity, null); addTechnicalInformations(entity, form.getForm()); return form; } @@ -110,7 +110,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> FormDto<D> loadToEdit(Class<D> dtoType, String id) { Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = loadEntity(dtoType, entityType, id); - FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); + //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser + FormDto<D> form = entityToEditFormDto(dtoType, entity, null); addTechnicalInformations(entity, form.getForm()); return form; } @@ -120,7 +121,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = newEntity(entityType); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser - FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); + FormDto<D> form = entityToEditFormDto(dtoType, entity, null); return form; } @@ -129,8 +130,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = dtoToEntity(dtoType, entityType, bean); entity = saveEntity(entityType, entity); - FormDto<D> model = entityToEditFormDto(dtoType, entityType, entity); - return model.getForm().getId(); + return entity.getTopiaId(); } @Override diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java index 8fc6cd7..cef70a1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java @@ -25,11 +25,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; -import fr.ird.observe.services.dto.longline.EncounterDto; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -39,27 +36,14 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia implements ActivityLongLineEncouterService { @Override - public FormDto<ActivityLonglineEncouterDto> loadToRead(String activityLonglineId) { - - ActivityLongline activityLongline = loadEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLonglineId); - - FormDto<ActivityLonglineEncouterDto> form = entityToReadFormDto(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLongline); - - return form; - - } - - @Override - public FormDto<ActivityLonglineEncouterDto> loadToEdit(String activityLonglineId) { + public FormDto<ActivityLonglineEncouterDto> loadForm(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLonglineId); FormDto<ActivityLonglineEncouterDto> form = entityToEditFormDto( ActivityLonglineEncouterDto.class, - ActivityLongline.class, activityLongline, - new ReferenceTypeName(EncounterDto.class, EncounterTypeDto.class, EncounterDto.PROPERTY_ENCOUNTER_TYPE), - new ReferenceTypeName(EncounterDto.class, SpeciesDto.class, EncounterDto.PROPERTY_SPECIES)); + ObserveReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_ENCOUTER_FORM); return form; @@ -76,5 +60,4 @@ public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia im } - } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java index b4c6a88..26dc538 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java @@ -25,12 +25,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; -import fr.ird.observe.services.dto.longline.SensorUsedDto; -import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; -import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; -import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -40,28 +36,13 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class ActivityLongLineSensorUsedServiceTopia extends ObserveServiceTopia implements ActivityLongLineSensorUsedService { @Override - public FormDto<ActivityLonglineSensorUsedDto> loadToRead(String activityLonglineId) { + public FormDto<ActivityLonglineSensorUsedDto> loadForm(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, activityLonglineId); - FormDto<ActivityLonglineSensorUsedDto> form = entityToReadFormDto(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, activityLongline); - - return form; - - } - - @Override - public FormDto<ActivityLonglineSensorUsedDto> loadToEdit(String activityLonglineId) { - - ActivityLongline activityLongline = loadEntity(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, activityLonglineId); - - FormDto<ActivityLonglineSensorUsedDto> form = entityToEditFormDto( - ActivityLonglineSensorUsedDto.class, - ActivityLongline.class, - activityLongline, - new ReferenceTypeName(SensorUsedDto.class, SensorTypeDto.class, SensorUsedDto.PROPERTY_SENSOR_TYPE), - new ReferenceTypeName(SensorUsedDto.class, SensorBrandDto.class, SensorUsedDto.PROPERTY_SENSOR_BRAND), - new ReferenceTypeName(SensorUsedDto.class, SensorDataFormatDto.class, SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT)); + FormDto<ActivityLonglineSensorUsedDto> form = entityToEditFormDto(ActivityLonglineSensorUsedDto.class, + activityLongline, + ObserveReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_SENSOR_USED_FORM); return form; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index 69fd30b..d287981 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -39,6 +39,7 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.type.CoordinateHelper; @@ -91,19 +92,6 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override - public FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId) { - - ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); - - FormDto<ActivityLonglineDto> form = entityToReadFormDto(ActivityLonglineDto.class, ActivityLongline.class, activityLongline); - - form.getForm().setHasSetLongline(activityLongline.getSetLongline() != null); - - return form; - - } - - @Override public ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); @@ -125,11 +113,13 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override - public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { + public FormDto<ActivityLonglineDto> loadForm(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); - FormDto<ActivityLonglineDto> form = entityToEditFormDto(ActivityLonglineDto.class, ActivityLongline.class, activityLongline); + FormDto<ActivityLonglineDto> form = entityToEditFormDto(ActivityLonglineDto.class, + activityLongline, + ObserveReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_FORM); form.getForm().setHasSetLongline(activityLongline.getSetLongline() != null); @@ -176,7 +166,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements preCreated.setTimeStamp(timestamp); - FormDto<ActivityLonglineDto> form = entityToEditFormDto(ActivityLonglineDto.class, ActivityLongline.class, preCreated); + FormDto<ActivityLonglineDto> form = entityToEditFormDto(ActivityLonglineDto.class, + preCreated, + ObserveReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_FORM); return form; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java index ebe6bfe..48f7b04 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java @@ -3,14 +3,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.services.dto.referential.longline.HookSizeDto; -import fr.ird.observe.services.dto.referential.longline.HookTypeDto; -import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -18,34 +12,13 @@ import fr.ird.observe.services.dto.referential.longline.LineTypeDto; public class BranchlineServiceTopia extends ObserveServiceTopia implements BranchlineService { @Override - public FormDto<BranchlineDto> loadToRead(String branchlineId) { + public FormDto<BranchlineDto> loadForm(String branchlineId) { Branchline branchline = loadEntity(BranchlineDto.class, Branchline.class, branchlineId); - FormDto<BranchlineDto> form = entityToReadFormDto( - BranchlineDto.class, - Branchline.class, - branchline); - - return form; - } - - @Override - public FormDto<BranchlineDto> loadToEdit(String branchlineId) { - - Branchline branchline = loadEntity(BranchlineDto.class, Branchline.class, branchlineId); - - FormDto<BranchlineDto> form = entityToEditFormDto( - BranchlineDto.class, - Branchline.class, - branchline, - new ReferenceTypeName(BranchlineDto.class, LineTypeDto.class, BranchlineDto.PROPERTY_TOP_TYPE), - new ReferenceTypeName(BranchlineDto.class, LineTypeDto.class, BranchlineDto.PROPERTY_TRACELINE_TYPE), - new ReferenceTypeName(BranchlineDto.class, HookTypeDto.class, BranchlineDto.PROPERTY_HOOK_TYPE), - new ReferenceTypeName(BranchlineDto.class, HookSizeDto.class, BranchlineDto.PROPERTY_HOOK_SIZE), - new ReferenceTypeName(BranchlineDto.class, BaitTypeDto.class, BranchlineDto.PROPERTY_BAIT_TYPE), - new ReferenceTypeName(BranchlineDto.class, BaitSettingStatusDto.class, BranchlineDto.PROPERTY_BAIT_SETTING_STATUS), - new ReferenceTypeName(BranchlineDto.class, BaitHaulingStatusDto.class, BranchlineDto.PROPERTY_BAIT_HAULING_STATUS)); + FormDto<BranchlineDto> form = entityToEditFormDto(BranchlineDto.class, + branchline, + ObserveReferenceSetRequestDefinitions.BRANCHLINE_FORM); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java index 2f9724d..560ee02 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.longline; * #L% */ -import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; @@ -30,24 +29,11 @@ import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; -import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; -import fr.ird.observe.services.dto.longline.SizeMeasureDto; -import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.services.dto.referential.SexDto; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; -import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; -import fr.ird.observe.services.dto.referential.longline.HealthnessDto; -import fr.ird.observe.services.dto.referential.longline.HookPositionDto; -import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; -import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -57,43 +43,15 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class SetLonglineCatchServiceTopia extends ObserveServiceTopia implements SetLonglineCatchService { @Override - public FormDto<SetLonglineCatchDto> loadToRead(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineCatchDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineCatchDto> form = entityToReadFormDto( - SetLonglineCatchDto.class, - SetLongline.class, - setLongline); - - return form; - } - - @Override - public FormDto<SetLonglineCatchDto> loadToEdit(String setLonglineId) { + public FormDto<SetLonglineCatchDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineCatchDto.class, SetLongline.class, setLonglineId); FormDto<SetLonglineCatchDto> form = entityToEditFormDto( SetLonglineCatchDto.class, - SetLongline.class, setLongline, - ImmutableMap.<String, Object>of(Section.PROPERTY_SET_LONGLINE, setLongline), - new ReferenceTypeName(CatchLonglineDto.class, SpeciesDto.class, CatchLonglineDto.PROPERTY_SPECIES_CATCH), - new ReferenceTypeName(CatchLonglineDto.class, HealthnessDto.class, CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS), - new ReferenceTypeName(CatchLonglineDto.class, HookPositionDto.class, CatchLonglineDto.PROPERTY_HOOK_POSITION), - new ReferenceTypeName(CatchLonglineDto.class, CatchFateLonglineDto.class, CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE), - new ReferenceTypeName(CatchLonglineDto.class, HealthnessDto.class, CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS), - new ReferenceTypeName(CatchLonglineDto.class, SpeciesDto.class, CatchLonglineDto.PROPERTY_PREDATOR), - new ReferenceTypeName(CatchLonglineDto.class, StomacFullnessDto.class, CatchLonglineDto.PROPERTY_STOMAC_FULLNESS), - new ReferenceTypeName(CatchLonglineDto.class, SexDto.class, CatchLonglineDto.PROPERTY_SEX), - new ReferenceTypeName(CatchLonglineDto.class, MaturityStatusDto.class, CatchLonglineDto.PROPERTY_MATURITY_STATUS), - new ReferenceTypeName(SizeMeasureDto.class, SizeMeasureTypeDto.class, SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE), - new ReferenceTypeName(WeightMeasureDto.class, WeightMeasureTypeDto.class, WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE), - new ReferenceTypeName(CatchLonglineDto.class, SectionDto.class, CatchLonglineDto.PROPERTY_SECTION), - new ReferenceTypeName(CatchLonglineDto.class, BasketDto.class, CatchLonglineDto.PROPERTY_BASKET), - new ReferenceTypeName(CatchLonglineDto.class, BranchlineDto.class, CatchLonglineDto.PROPERTY_BRANCHLINE), - new ReferenceTypeName(BranchlineDto.class, BaitHaulingStatusDto.class, BranchlineDto.PROPERTY_BAIT_HAULING_STATUS) // utilisé pour l'edition des l'anvançon + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_CATCH_FORM + //ImmutableMap.<String, Object>of(Section.PROPERTY_SET_LONGLINE, setLongline), //FIXME context ); for(Section section : setLongline.getSection()) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java index 2ed5426..3a98607 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java @@ -28,17 +28,11 @@ import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; -import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.services.dto.referential.longline.HookSizeDto; -import fr.ird.observe.services.dto.referential.longline.HookTypeDto; -import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -48,34 +42,14 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopia implements SetLonglineDetailCompositionService { @Override - public FormDto<SetLonglineDetailCompositionDto> loadToRead(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineDetailCompositionDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineDetailCompositionDto> form = entityToReadFormDto( - SetLonglineDetailCompositionDto.class, - SetLongline.class, - setLongline); - - return form; - } - - @Override - public FormDto<SetLonglineDetailCompositionDto> loadToEdit(String setLonglineId) { + public FormDto<SetLonglineDetailCompositionDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineDetailCompositionDto.class, SetLongline.class, setLonglineId); FormDto<SetLonglineDetailCompositionDto> form = entityToEditFormDto( SetLonglineDetailCompositionDto.class, - SetLongline.class, setLongline, - new ReferenceTypeName(BranchlineDto.class, LineTypeDto.class, BranchlineDto.PROPERTY_TOP_TYPE), - new ReferenceTypeName(BranchlineDto.class, LineTypeDto.class, BranchlineDto.PROPERTY_TRACELINE_TYPE), - new ReferenceTypeName(BranchlineDto.class, HookTypeDto.class, BranchlineDto.PROPERTY_HOOK_TYPE), - new ReferenceTypeName(BranchlineDto.class, HookSizeDto.class, BranchlineDto.PROPERTY_HOOK_SIZE), - new ReferenceTypeName(BranchlineDto.class, BaitTypeDto.class, BranchlineDto.PROPERTY_BAIT_TYPE), - new ReferenceTypeName(BranchlineDto.class, BaitSettingStatusDto.class, BranchlineDto.PROPERTY_BAIT_SETTING_STATUS), - new ReferenceTypeName(BranchlineDto.class, BaitHaulingStatusDto.class, BranchlineDto.PROPERTY_BAIT_HAULING_STATUS)); + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_DETAIL_COMPOSITION_FORM); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java index d8c5333..7deb7a5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java @@ -25,18 +25,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; -import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; -import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; -import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.services.dto.referential.longline.HookSizeDto; -import fr.ird.observe.services.dto.referential.longline.HookTypeDto; -import fr.ird.observe.services.dto.referential.longline.LineTypeDto; -import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -46,35 +36,13 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class SetLonglineGlobalCompositionServiceTopia extends ObserveServiceTopia implements SetLonglineGlobalCompositionService { @Override - public FormDto<SetLonglineGlobalCompositionDto> loadToRead(String setLonglineId) { + public FormDto<SetLonglineGlobalCompositionDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineGlobalCompositionDto.class, SetLongline.class, setLonglineId); - FormDto<SetLonglineGlobalCompositionDto> form = entityToReadFormDto( - SetLonglineGlobalCompositionDto.class, - SetLongline.class, - setLongline); - - return form; - } - - @Override - public FormDto<SetLonglineGlobalCompositionDto> loadToEdit(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineGlobalCompositionDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineGlobalCompositionDto> form = entityToEditFormDto( - SetLonglineGlobalCompositionDto.class, - SetLongline.class, - setLongline, - new ReferenceTypeName(FloatlinesCompositionDto.class, LineTypeDto.class, FloatlinesCompositionDto.PROPERTY_LINE_TYPE), - new ReferenceTypeName(BranchlinesCompositionDto.class, LineTypeDto.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE), - new ReferenceTypeName(BranchlinesCompositionDto.class, LineTypeDto.class, BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE), - new ReferenceTypeName(HooksCompositionDto.class, HookTypeDto.class, HooksCompositionDto.PROPERTY_HOOK_TYPE), - new ReferenceTypeName(HooksCompositionDto.class, HookSizeDto.class, HooksCompositionDto.PROPERTY_HOOK_SIZE), - new ReferenceTypeName(BaitsCompositionDto.class, BaitSettingStatusDto.class, BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS), - new ReferenceTypeName(BaitsCompositionDto.class, BaitTypeDto.class, BaitsCompositionDto.PROPERTY_BAIT_TYPE), - new ReferenceTypeName(SetLonglineGlobalCompositionDto.class, MitigationTypeDto.class, SetLonglineGlobalCompositionDto.PROPERTY_MITIGATION_TYPE)); + FormDto<SetLonglineGlobalCompositionDto> form = entityToEditFormDto(SetLonglineGlobalCompositionDto.class, + setLongline, + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_GLOBAL_COMPOSITION_FORM); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java index c3cfa6f..723a5b0 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.ReferenceDto; 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.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.service.DataNotFoundException; @@ -48,11 +49,19 @@ import java.util.Set; public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetLonglineService { @Override - public FormDto<SetLonglineDto> loadToRead(String setLonglineId) { + public FormDto<SetLonglineDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); - FormDto<SetLonglineDto> form = entityToReadFormDto(SetLonglineDto.class, SetLongline.class, setLongline); + FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, + setLongline, + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_FORM); + + ActivityLonglineTopiaDao activityLonglineDao = getTopiaPersistenceContext().getActivityLonglineDao(); + + ActivityLongline activityLongline = activityLonglineDao.forSetLonglineEquals(setLongline).findUnique(); + + form.getForm().setOtherSets(getOtherSetLonglineDtos(activityLongline, setLongline)); return form; @@ -79,23 +88,6 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } @Override - public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, SetLongline.class, setLongline); - - ActivityLonglineTopiaDao activityLonglineDao = getTopiaPersistenceContext().getActivityLonglineDao(); - - ActivityLongline activityLongline = activityLonglineDao.forSetLonglineEquals(setLongline).findUnique(); - - form.getForm().setOtherSets(getOtherSetLonglineDtos(activityLongline, setLongline)); - - return form; - - } - - @Override public FormDto<SetLonglineDto> preCreate(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); @@ -120,14 +112,16 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL preCreated.setSettingStartLatitude(latitude); preCreated.setSettingStartLongitude(longitude); - FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, SetLongline.class, preCreated); + FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, + preCreated, + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_FORM); form.getForm().setOtherSets(getOtherSetLonglineDtos(activityLongline, preCreated)); return form; } - + @Override public SaveResultDto save(String activityLonglineId, SetLonglineDto setLonglineDto) { @@ -166,9 +160,9 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } - protected Set<SetLonglineStubDto> getOtherSetLonglineDtos(ActivityLongline currentActivityLongline, SetLongline setLongline) { + protected Set<SetLonglineStubDto> getOtherSetLonglineDtos(ActivityLongline currentActivityLongline, SetLongline setLongline) { - Set<SetLonglineStubDto> otherSetLonglineDtos = Sets.newHashSet(); + Set<SetLonglineStubDto> otherSetLonglineDtos = Sets.newHashSet(); TripLonglineTopiaDao tripLonglineDao = getTopiaPersistenceContext().getTripLonglineDao(); @@ -178,7 +172,7 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL SetLongline otherSetLongline = activityLongline.getSetLongline(); - if (otherSetLongline != null && ! setLongline.equals(otherSetLongline)) { + if (otherSetLongline != null && !setLongline.equals(otherSetLongline)) { SetLonglineStubDto otherSetDto = new SetLonglineStubDto(); otherSetDto.setId(otherSetLongline.getTopiaId()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java index a122222..5c817e3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.longline; * #L% */ -import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; @@ -30,16 +29,11 @@ import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.TdrDto; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; -import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; -import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -49,35 +43,16 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class TdrServiceTopia extends ObserveServiceTopia implements TdrService { @Override - public FormDto<SetLonglineTdrDto> loadToRead(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineTdrDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineTdrDto> form = entityToReadFormDto( - SetLonglineTdrDto.class, - SetLongline.class, - setLongline); - - return form; - } - - @Override - public FormDto<SetLonglineTdrDto> loadToEdit(String setLonglineId) { + public FormDto<SetLonglineTdrDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineTdrDto.class, SetLongline.class, setLonglineId); FormDto<SetLonglineTdrDto> form = entityToEditFormDto( SetLonglineTdrDto.class, - SetLongline.class, setLongline, - ImmutableMap.<String, Object>of(Section.PROPERTY_SET_LONGLINE, setLongline), - new ReferenceTypeName(TdrDto.class, SensorBrandDto.class, TdrDto.PROPERTY_SENSOR_BRAND), - new ReferenceTypeName(TdrDto.class, ItemHorizontalPositionDto.class, TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION), - new ReferenceTypeName(TdrDto.class, ItemVerticalPositionDto.class, TdrDto.PROPERTY_ITEM_VERTICAL_POSITION), - new ReferenceTypeName(TdrDto.class, SpeciesDto.class, TdrDto.PROPERTY_SPECIES), - new ReferenceTypeName(TdrDto.class, SectionDto.class, TdrDto.PROPERTY_SECTION), - new ReferenceTypeName(TdrDto.class, BasketDto.class, TdrDto.PROPERTY_BASKET), - new ReferenceTypeName(TdrDto.class, BranchlineDto.class, TdrDto.PROPERTY_BRANCHLINE)); + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_TDR_FORM + //ImmutableMap.<String, Object>of(Section.PROPERTY_SET_LONGLINE, setLongline), //FIXME context + ); for(Section section : setLongline.getSection()) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java index fe89e0a..521d797 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java @@ -26,12 +26,8 @@ import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; -import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -41,26 +37,14 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia implements TripLonglineGearUseService { @Override - public FormDto<TripLonglineGearUseDto> loadToRead(String tripLonglineId) { - - TripLongline tripLongline = loadEntity(TripLonglineGearUseDto.class, TripLongline.class, tripLonglineId); - - FormDto<TripLonglineGearUseDto> form = entityToReadFormDto(TripLonglineGearUseDto.class, TripLongline.class, tripLongline); - - return form; - } - - @Override - public FormDto<TripLonglineGearUseDto> loadToEdit(String tripLonglineId) { + public FormDto<TripLonglineGearUseDto> loadForm(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineGearUseDto.class, TripLongline.class, tripLonglineId); FormDto<TripLonglineGearUseDto> form = entityToEditFormDto( TripLonglineGearUseDto.class, - TripLongline.class, tripLongline, - new ReferenceTypeName(GearUseFeaturesLonglineDto.class, GearDto.class, GearUseFeaturesLonglineDto.PROPERTY_GEAR), - new ReferenceTypeName(GearUseFeaturesMeasurementLonglineDto.class, GearCaracteristicDto.class, GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC)); + ObserveReferenceSetRequestDefinitions.TRIP_LONGLINE_GEAR_USE_FORM); return form; } 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 a7c7691..a9266f9 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 @@ -35,8 +35,10 @@ import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.TripMapDtos; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -53,10 +55,6 @@ import java.util.List; */ public class TripLonglineServiceTopia extends ObserveServiceTopia implements TripLonglineService { - protected TripLonglineTopiaDao getDao() { - return (TripLonglineTopiaDao) serviceContext.getTopiaPersistenceContext().getDao(TripLongline.class); - } - @Override public ReferenceSetDto<TripLonglineDto> getAllTripLongline() { @@ -80,7 +78,6 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri return stubReferences; } - @Override public ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId) { @@ -105,6 +102,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri return stubReferences; } + @Override public TripLonglineDto loadDto(String tripLonglineId) { return loadEntityToDto(TripLonglineDto.class, tripLonglineId); @@ -123,26 +121,11 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripLonglineId); - TripMapDto tripMapDto = new TripMapDto(); - - tripMapDto.setId(tripLonglineId); - - tripMapDto.setPoints(points); - + TripMapDto tripMapDto = TripMapDtos.newTripMapDto(tripLonglineId, points); return tripMapDto; } @Override - public FormDto<TripLonglineDto> loadToRead(String tripLonglineId) { - - TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); - - FormDto<TripLonglineDto> form = entityToReadFormDto(TripLonglineDto.class, TripLongline.class, tripLongline); - - return form; - } - - @Override public ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); @@ -158,11 +141,13 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { + public FormDto<TripLonglineDto> loadForm(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); - FormDto<TripLonglineDto> form = entityToEditFormDto(TripLonglineDto.class, TripLongline.class, tripLongline); + FormDto<TripLonglineDto> form = entityToEditFormDto(TripLonglineDto.class, + tripLongline, + ObserveReferenceSetRequestDefinitions.TRIP_LONGLINE_FORM); TripLonglineDto tripLonglineDto = form.getForm(); @@ -189,7 +174,9 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri tripLongline.setProgram(program); - FormDto<TripLonglineDto> form = entityToEditFormDto(TripLonglineDto.class, TripLongline.class, tripLongline); + FormDto<TripLonglineDto> form = entityToEditFormDto(TripLonglineDto.class, + tripLongline, + ObserveReferenceSetRequestDefinitions.TRIP_LONGLINE_FORM); return form; } @@ -246,4 +233,8 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri return result; } + + protected TripLonglineTopiaDao getDao() { + return (TripLonglineTopiaDao) serviceContext.getTopiaPersistenceContext().getDao(TripLongline.class); + } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java index 215e882..a832f19 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java @@ -25,8 +25,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; @@ -37,25 +36,13 @@ import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; public class ActivitySeineObservedSystemServiceTopia extends ObserveServiceTopia implements ActivitySeineObservedSystemService { @Override - public FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId) { + public FormDto<ActivitySeineObservedSystemDto> loadForm(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineObservedSystemDto.class, ActivitySeine.class, activitySeineId); - FormDto<ActivitySeineObservedSystemDto> form = entityToReadFormDto(ActivitySeineObservedSystemDto.class, ActivitySeine.class, activitySeine); - - return form; - } - - @Override - public FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId) { - - ActivitySeine activitySeine = loadEntity(ActivitySeineObservedSystemDto.class, ActivitySeine.class, activitySeineId); - - //FIXME Voir s'il faut aussi le faire pour le read (je ne peux plus créer de base... donc pas finir de tester) FormDto<ActivitySeineObservedSystemDto> form = entityToEditFormDto(ActivitySeineObservedSystemDto.class, - ActivitySeine.class, activitySeine, - new ReferenceTypeName(ActivitySeineObservedSystemDto.class, ObservedSystemDto.class, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM)); + ObserveReferenceSetRequestDefinitions.ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index c96e044..43ffc06 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -37,6 +37,7 @@ 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.ReferenceSetDtos; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -56,7 +57,6 @@ import java.util.List; */ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements ActivitySeineService { - @Override public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { @@ -100,19 +100,6 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override - public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { - - ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - - FormDto<ActivitySeineDto> form = entityToReadFormDto(ActivitySeineDto.class, ActivitySeine.class, activitySeine); - - form.getForm().setObservedSystemEmpty(activitySeine.isObservedSystemEmpty()); - form.getForm().setFloatingObjectEmpty(activitySeine.isFloatingObjectEmpty()); - - return form; - } - - @Override public ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); @@ -132,11 +119,13 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override - public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { + public FormDto<ActivitySeineDto> loadForm(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - FormDto<ActivitySeineDto> form = entityToEditFormDto(ActivitySeineDto.class, ActivitySeine.class, activitySeine); + FormDto<ActivitySeineDto> form = entityToEditFormDto(ActivitySeineDto.class, + activitySeine, + ObserveReferenceSetRequestDefinitions.ACTIVITY_SEINE_FORM); form.getForm().setObservedSystemEmpty(activitySeine.isObservedSystemEmpty()); form.getForm().setFloatingObjectEmpty(activitySeine.isFloatingObjectEmpty()); @@ -190,7 +179,9 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac preCreated.setTime(DateUtil.getTime(time, false, false)); preCreated.setCurrentFpaZone(currentFpaZone); - FormDto<ActivitySeineDto> form = entityToEditFormDto(ActivitySeineDto.class, ActivitySeine.class, preCreated); + FormDto<ActivitySeineDto> form = entityToEditFormDto(ActivitySeineDto.class, + preCreated, + ObserveReferenceSetRequestDefinitions.ACTIVITY_SEINE_FORM); form.getForm().setObservedSystemEmpty(preCreated.isObservedSystemEmpty()); form.getForm().setFloatingObjectEmpty(preCreated.isFloatingObjectEmpty()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index 6674efc..6c8e3fa 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectDtos; @@ -70,16 +71,6 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override - public FormDto<FloatingObjectDto> loadToRead(String floatingObjectId) { - - FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); - - FormDto<FloatingObjectDto> form = entityToReadFormDto(FloatingObjectDto.class, FloatingObject.class, floatingObject); - - return form; - } - - @Override public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { ReferenceLocale referenceLocale = getReferenceLocale(); @@ -104,11 +95,13 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override - public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { + public FormDto<FloatingObjectDto> loadForm(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); - FormDto<FloatingObjectDto> form = entityToEditFormDto(FloatingObjectDto.class, FloatingObject.class, floatingObject); + FormDto<FloatingObjectDto> form = entityToEditFormDto(FloatingObjectDto.class, + floatingObject, + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); return form; } @@ -118,7 +111,9 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F FloatingObject floatingObject = newEntity(FloatingObject.class); - FormDto<FloatingObjectDto> form = entityToEditFormDto(FloatingObjectDto.class, FloatingObject.class, floatingObject); + FormDto<FloatingObjectDto> form = entityToEditFormDto(FloatingObjectDto.class, + floatingObject, + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); return form; } @@ -150,7 +145,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); - if (! activitySeine.containsFloatingObject(floatingObject)) { + if (!activitySeine.containsFloatingObject(floatingObject)) { throw new DataNotFoundException(FloatingObjectDto.class, floatingObjectId); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java index 932f94c..228569a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import fr.ird.observe.entities.referentiel.Ocean; @@ -36,10 +35,7 @@ import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; -import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; @@ -55,17 +51,7 @@ import java.util.Set; public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements NonTargetCatchService { @Override - public FormDto<SetSeineNonTargetCatchDto> loadToRead(String setSeineId) { - - SetSeine setSeine = loadEntity(SetSeineNonTargetCatchDto.class, SetSeine.class, setSeineId); - - FormDto<SetSeineNonTargetCatchDto> form = entityToReadFormDto(SetSeineNonTargetCatchDto.class, SetSeine.class, setSeine); - - return form; - } - - @Override - public FormDto<SetSeineNonTargetCatchDto> loadToEdit(String setSeineId, String tripSeineId) { + public FormDto<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId) { SetSeine setSeine = loadEntity(SetSeineNonTargetCatchDto.class, SetSeine.class, setSeineId); @@ -75,12 +61,10 @@ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements N FormDto<SetSeineNonTargetCatchDto> form = entityToEditFormDto( SetSeineNonTargetCatchDto.class, - SetSeine.class, setSeine, - ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), - new ReferenceTypeName(NonTargetCatchDto.class, SpeciesDto.class, NonTargetCatchDto.PROPERTY_SPECIES), - new ReferenceTypeName(NonTargetCatchDto.class, SpeciesFateDto.class, NonTargetCatchDto.PROPERTY_SPECIES_FATE), - new ReferenceTypeName(NonTargetCatchDto.class, ReasonForDiscardDto.class, NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD)); + ObserveReferenceSetRequestDefinitions.SET_SEINE_FORM + //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context + ); SetSeineNonTargetCatchDto setSeineNonTargetCatchDto = form.getForm(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java index 76ff6d3..5980335 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java @@ -32,10 +32,8 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -75,19 +73,7 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements } @Override - public FormDto<NonTargetSampleDto> loadToRead(String setSeineId) { - - SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - - NonTargetSample nonTargetSample = getNonTargetSample(setSeine); - - FormDto<NonTargetSampleDto> form = entityToReadFormDto(NonTargetSampleDto.class, NonTargetSample.class, nonTargetSample); - - return form; - } - - @Override - public FormDto<NonTargetSampleDto> loadToEdit(String setSeineId) { + public FormDto<NonTargetSampleDto> loadForm(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); @@ -95,13 +81,10 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements FormDto<NonTargetSampleDto> form = entityToEditFormDto( NonTargetSampleDto.class, - NonTargetSample.class, nonTargetSample, - new ReferenceTypeName(NonTargetLengthDto.class, SexDto.class, NonTargetLengthDto.PROPERTY_SEX), - new ReferenceTypeName(NonTargetLengthDto.class, SpeciesDto.class, NonTargetLengthDto.PROPERTY_SPECIES) - ); + ObserveReferenceSetRequestDefinitions.SET_SEINE_NON_TARGET_CATCH_FORM); - // on filtre la list des espéces cibles + // on filtre la liste des espéces cibles Set<Species> speciesSet = Sets.newLinkedHashSet(); // on recupere la liste des espèces thon cible @@ -116,10 +99,10 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements } } - + //FIXME request LinkedHashSet<ReferenceDto<SpeciesDto>> speciesRefs = Sets.newLinkedHashSet(); - for (Species species : speciesSet ) { + for (Species species : speciesSet) { speciesRefs.add(entityToReferenceDto(SpeciesDto.class, species)); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java index 3c4109a..2dfed78 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java @@ -25,11 +25,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; -import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -37,22 +34,7 @@ import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia implements ObjectObservedSpeciesService { @Override - public FormDto<FloatingObjectObservedSpeciesDto> loadToRead(String floatingObjectId) { - - FloatingObject floatingObject = - loadEntity(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, floatingObjectId); - - FormDto<FloatingObjectObservedSpeciesDto> form = - entityToReadFormDto( - FloatingObjectObservedSpeciesDto.class, - FloatingObject.class, - floatingObject); - - return form; - } - - @Override - public FormDto<FloatingObjectObservedSpeciesDto> loadToEdit(String floatingObjectId) { + public FormDto<FloatingObjectObservedSpeciesDto> loadForm(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, floatingObjectId); @@ -60,10 +42,8 @@ public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia imple FormDto<FloatingObjectObservedSpeciesDto> form = entityToEditFormDto( FloatingObjectObservedSpeciesDto.class, - FloatingObject.class, floatingObject, - new ReferenceTypeName(ObjectObservedSpeciesDto.class, SpeciesDto.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES), - new ReferenceTypeName(ObjectObservedSpeciesDto.class, SpeciesStatusDto.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS)); + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_OBSERVED_SPECIES_FORM); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java index 51a1c05..4179233 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java @@ -26,6 +26,7 @@ import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceTypeName; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; @@ -37,19 +38,7 @@ import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implements ObjectSchoolEstimateService { @Override - public FormDto<FloatingObjectSchoolEstimateDto> loadToRead(String floatingObjectId) { - - FloatingObject floatingObject = - loadEntity(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, floatingObjectId); - - FormDto<FloatingObjectSchoolEstimateDto> form = - entityToReadFormDto(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, floatingObject); - - return form; - } - - @Override - public FormDto<FloatingObjectSchoolEstimateDto> loadToEdit(String floatingObjectId) { + public FormDto<FloatingObjectSchoolEstimateDto> loadForm(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, floatingObjectId); @@ -57,8 +46,8 @@ public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implem FormDto<FloatingObjectSchoolEstimateDto> form = entityToEditFormDto( FloatingObjectSchoolEstimateDto.class, - FloatingObject.class, floatingObject, + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_SCHOOL_ESTIMATE_FORM, new ReferenceTypeName(ObjectSchoolEstimateDto.class, SpeciesDto.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES)); return form; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 2f3e494..b82c596 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -113,18 +113,6 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override - public FormDto<RouteDto> loadToRead(String routeId) { - - Route route = loadEntity(RouteDto.class, Route.class, routeId); - - FormDto<RouteDto> form = entityToReadFormDto(RouteDto.class, Route.class, route); - - bindFindeVeilleProperties(route.getActivitySeine(), form.getForm().getActivitySeine()); - - return form; - } - - @Override public ReferenceDto<RouteDto> loadReferenceToRead(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); @@ -148,11 +136,11 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override - public FormDto<RouteDto> loadToEdit(String routeId) { + public FormDto<RouteDto> loadForm(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); - FormDto<RouteDto> form = entityToEditFormDto(RouteDto.class, Route.class, route); + FormDto<RouteDto> form = entityToEditFormDto(RouteDto.class, route, null); bindFindeVeilleProperties(route.getActivitySeine(), form.getForm().getActivitySeine()); @@ -187,7 +175,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi preCreated.setDate(DateUtil.getDay(date)); - FormDto<RouteDto> form = entityToEditFormDto(RouteDto.class, Route.class, preCreated); + FormDto<RouteDto> form = entityToEditFormDto(RouteDto.class, preCreated, null); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java index abf9075..8a7aa39 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java @@ -22,17 +22,13 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.SchoolEstimate; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.seine.SchoolEstimateDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -40,18 +36,9 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class SchoolEstimateServiceTopia extends ObserveServiceTopia implements SchoolEstimateService { - @Override - public FormDto<SetSeineSchoolEstimateDto> loadToRead(String setSeineId) { - - SetSeine setSeine = loadEntity(SetSeineSchoolEstimateDto.class, SetSeine.class, setSeineId); - - FormDto<SetSeineSchoolEstimateDto> form = entityToReadFormDto(SetSeineSchoolEstimateDto.class, SetSeine.class, setSeine); - - return form; - } @Override - public FormDto<SetSeineSchoolEstimateDto> loadToEdit(String setSeineId, String tripSeineId) { + public FormDto<SetSeineSchoolEstimateDto> loadForm(String setSeineId, String tripSeineId) { SetSeine setSeine = loadEntity(SetSeineSchoolEstimateDto.class, SetSeine.class, setSeineId); @@ -61,10 +48,10 @@ public class SchoolEstimateServiceTopia extends ObserveServiceTopia implements S FormDto<SetSeineSchoolEstimateDto> form = entityToEditFormDto( SetSeineSchoolEstimateDto.class, - SetSeine.class, setSeine, - ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), - new ReferenceTypeName(SchoolEstimateDto.class, SpeciesDto.class, SchoolEstimateDto.PROPERTY_SPECIES)); + ObserveReferenceSetRequestDefinitions.SET_SEINE_SCHOOL_ESTIMATE_FORM + //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context + ); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java index 9c7bc1a..f3a8116 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java @@ -29,6 +29,7 @@ import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -43,16 +44,6 @@ import java.util.Date; public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSeineService { @Override - public FormDto<SetSeineDto> loadToRead(String setSeineId) { - - SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - - FormDto<SetSeineDto> form = entityToReadFormDto(SetSeineDto.class, SetSeine.class, setSeine); - - return form; - } - - @Override public ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); @@ -73,11 +64,13 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein } @Override - public FormDto<SetSeineDto> loadToEdit(String setSeineId) { + public FormDto<SetSeineDto> loadForm(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - FormDto<SetSeineDto> form = entityToEditFormDto(SetSeineDto.class, SetSeine.class, setSeine); + FormDto<SetSeineDto> form = entityToEditFormDto(SetSeineDto.class, + setSeine, + ObserveReferenceSetRequestDefinitions.SET_SEINE_FORM); return form; } @@ -89,7 +82,7 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - if (! route.containsActivitySeine(activitySeine)) { + if (!route.containsActivitySeine(activitySeine)) { throw new DataNotFoundException(ActivitySeineDto.class, activitySeineId); } @@ -114,7 +107,9 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein SchoolType schoolType = activitySeine.getSchoolType(); preCreated.setSchoolType(schoolType); - FormDto<SetSeineDto> form = entityToEditFormDto(SetSeineDto.class, SetSeine.class, preCreated); + FormDto<SetSeineDto> form = entityToEditFormDto(SetSeineDto.class, + preCreated, + ObserveReferenceSetRequestDefinitions.SET_SEINE_FORM); return form; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java index 254b91a..ab6adc4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java @@ -1,7 +1,6 @@ package fr.ird.observe.services.service.seine; import com.google.common.base.Optional; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -16,10 +15,7 @@ import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -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.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; @@ -38,29 +34,7 @@ import java.util.Set; public class TargetCatchServiceTopia extends ObserveServiceTopia implements TargetCatchService { @Override - public FormDto<SetSeineTargetCatchDto> loadToRead(String setSeineId, boolean discarded) { - - SetSeine setSeine = loadEntity(SetSeineTargetCatchDto.class, SetSeine.class, setSeineId); - - FormDto<SetSeineTargetCatchDto> form = entityToReadFormDto(SetSeineTargetCatchDto.class, SetSeine.class, setSeine); - - SetSeineTargetCatchDto setSeineTargetCatchDto = form.getForm(); - - setSeineTargetCatchDto.setDiscarded(discarded); - - // on filtre les captures pour ne garder que les conservées ou les rejetées - Collection<TargetCatchDto> allTargetCatchDtos = setSeineTargetCatchDto.getTargetCatch(); - - List<TargetCatchDto> targetCatchDtos = Lists.newArrayList(Iterables.filter(allTargetCatchDtos, TargetCatchDtos.newDiscardedPredicate(discarded))); - - setSeineTargetCatchDto.setTargetCatch(targetCatchDtos); - - - return form; - } - - @Override - public FormDto<SetSeineTargetCatchDto> loadToEdit(String setSeineId, boolean discarded, String tripSeineId) { + public FormDto<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId) { SetSeine setSeine = loadEntity(SetSeineTargetCatchDto.class, SetSeine.class, setSeineId); @@ -70,12 +44,10 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ FormDto<SetSeineTargetCatchDto> form = entityToEditFormDto( SetSeineTargetCatchDto.class, - SetSeine.class, setSeine, - ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), - new ReferenceTypeName(TargetCatchDto.class, SpeciesDto.class, TargetCatchDto.PROPERTY_SPECIES), - new ReferenceTypeName(TargetCatchDto.class, ReasonForDiscardDto.class, TargetCatchDto.PROPERTY_REASON_FOR_DISCARD), - new ReferenceTypeName(TargetCatchDto.class, WeightCategoryDto.class, TargetCatchDto.PROPERTY_WEIGHT_CATEGORY)); + ObserveReferenceSetRequestDefinitions.SET_SEINE_TARGET_CATCH_FORM + //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context + ); SetSeineTargetCatchDto setSeineTargetCatchDto = form.getForm(); @@ -129,7 +101,7 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ List<TargetCatchDto> otherTargetCatchDtos = Lists.newArrayList(Iterables.filter( allTargetCatchDtos, - TargetCatchDtos.newDiscardedPredicate( ! dto.isDiscarded()))); + TargetCatchDtos.newDiscardedPredicate(!dto.isDiscarded()))); dto.addAllTargetCatch(otherTargetCatchDtos); @@ -152,7 +124,7 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ for (TargetLength targetLength : targetSample.getTargetLength()) { - if (! speciesCatchs.contains(targetLength.getSpecies())) { + if (!speciesCatchs.contains(targetLength.getSpecies())) { targetLengthToDelete.add(targetLength); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java index a55f943..656ea17 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java @@ -32,7 +32,7 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; -import fr.ird.observe.services.dto.ReferenceTypeName; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -73,19 +73,7 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar } @Override - public FormDto<TargetSampleDto> loadToRead(String setSeineId, boolean discarded) { - - SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - - TargetSample targetSample = getTargetSample(setSeine, discarded); - - FormDto<TargetSampleDto> form = entityToReadFormDto(TargetSampleDto.class, TargetSample.class, targetSample); - - return form; - } - - @Override - public FormDto<TargetSampleDto> loadToEdit(String setSeineId, boolean discarded) { + public FormDto<TargetSampleDto> loadForm(String setSeineId, boolean discarded) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); @@ -93,9 +81,8 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar FormDto<TargetSampleDto> form = entityToEditFormDto( TargetSampleDto.class, - TargetSample.class, targetSample, - new ReferenceTypeName(TargetLengthDto.class, SpeciesDto.class, TargetLengthDto.PROPERTY_SPECIES)); + ObserveReferenceSetRequestDefinitions.TARGET_SAMPLE_FORM); // on filtre la list des espéces cibles Set<Species> speciesSet = Sets.newLinkedHashSet(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java index 67fd1cb..21429cb 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java @@ -25,12 +25,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.CountryDto; -import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; -import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; -import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -38,19 +34,7 @@ import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia implements TransmittingBuoyOperationService { @Override - public FormDto<FloatingObjectTransmittingBuoyDto> loadToRead(String floatingObjectId) { - - FloatingObject floatingObject = - loadEntity(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, floatingObjectId); - - FormDto<FloatingObjectTransmittingBuoyDto> form = - entityToReadFormDto(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, floatingObject); - - return form; - } - - @Override - public FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String floatingObjectId) { + public FormDto<FloatingObjectTransmittingBuoyDto> loadForm(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, floatingObjectId); @@ -58,11 +42,8 @@ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia i FormDto<FloatingObjectTransmittingBuoyDto> form = entityToEditFormDto( FloatingObjectTransmittingBuoyDto.class, - FloatingObject.class, floatingObject, - new ReferenceTypeName(TransmittingBuoyDto.class, TransmittingBuoyOperationDto.class, TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION), - new ReferenceTypeName(TransmittingBuoyDto.class, TransmittingBuoyTypeDto.class, TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE), - new ReferenceTypeName(TransmittingBuoyDto.class, CountryDto.class, TransmittingBuoyDto.PROPERTY_COUNTRY)); + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_TRANSMITTING_BUOY_FORM); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java index e8b0e7f..63856c8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java @@ -26,13 +26,9 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; -import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; -import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; /** @@ -41,26 +37,14 @@ import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; public class TripSeineGearUseServiceTopia extends ObserveServiceTopia implements TripSeineGearUseService { @Override - public FormDto<TripSeineGearUseDto> loadToRead(String tripSeineId) { - - TripSeine tripSeine = loadEntity(TripSeineGearUseDto.class, TripSeine.class, tripSeineId); - - FormDto<TripSeineGearUseDto> form = entityToReadFormDto(TripSeineGearUseDto.class, TripSeine.class, tripSeine); - - return form; - } - - @Override - public FormDto<TripSeineGearUseDto> loadToEdit(String tripSeineId) { + public FormDto<TripSeineGearUseDto> loadForm(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineGearUseDto.class, TripSeine.class, tripSeineId); FormDto<TripSeineGearUseDto> form = entityToEditFormDto( TripSeineGearUseDto.class, - TripSeine.class, tripSeine, - new ReferenceTypeName(GearUseFeaturesSeineDto.class, GearDto.class, GearUseFeaturesSeineDto.PROPERTY_GEAR), - new ReferenceTypeName(GearUseFeaturesMeasurementSeineDto.class, GearCaracteristicDto.class, GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC)); + ObserveReferenceSetRequestDefinitions.TRIP_SEINE_GEAR_USE_FORM); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 4473b56..aed6e26 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceLocale; @@ -35,6 +34,7 @@ import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.TripMapDtos; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -115,11 +115,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); - //FIXME Remove labels building from the entityToEditFormDto method - form.setLabels(ImmutableList.<ReferenceSetDto>of()); - - form.setReferentialReferenceSetRequestName(ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM.name()); + FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, + tripSeine, + ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM); TripSeineDto tripSeineDto = form.getForm(); @@ -134,7 +132,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe @Override public TripSeineDto loadDto(String tripSeineId) { - TripSeineDto dto= loadEntityToDto(TripSeineDto.class, tripSeineId); + TripSeineDto dto = loadEntityToDto(TripSeineDto.class, tripSeineId); return dto; } @@ -143,13 +141,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); - TripMapDto tripMapDto = new TripMapDto(); - - tripMapDto.setId(tripSeineId); - - tripMapDto.setPoints(points); - + TripMapDto tripMapDto = TripMapDtos.newTripMapDto(tripSeineId, points); return tripMapDto; + } @Override @@ -181,8 +175,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe tripSeine.setProgram(program); - FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); - form.setReferentialReferenceSetRequestName(ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM.name()); + FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, + tripSeine, + ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM); return form; } -- 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/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 72354693d1f7b6dd25d302ba45b1fcdcd8e54e19 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 21 08:27:57 2015 +0100 Impact dans les handlers dues aux renommages de l'API des services + début d'utilisation des bons objets là où il faut : si j'ai un ReferentialReference et bien je veux m'en servir; toujours être le plus précis possible) --- .../fr/ird/observe/ui/content/ContentUIModel.java | 14 +++ .../LonglineDetailCompositionUIHandler.java | 27 ++-- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../ActivitySeineObservedSystemUIHandler.java | 6 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 6 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 5 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 3 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 23 ++-- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 7 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 22 ++-- .../table/impl/seine/NonTargetSampleUI.jaxx | 5 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 12 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 5 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 3 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 2 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 3 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 18 ++- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 7 +- .../table/impl/seine/TargetCatchUIHandler.java | 46 +++---- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 9 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 138 ++++++++++----------- .../content/table/impl/seine/TargetSampleUI.jaxx | 3 +- .../table/impl/seine/TargetSampleUIHandler.java | 5 +- .../fr/ird/observe/services/dto/TripMapDtos.java | 15 +++ 38 files changed, 227 insertions(+), 189 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java index 5259b99..7a7da5e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java @@ -24,10 +24,16 @@ package fr.ird.observe.ui.content; import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; +import java.util.LinkedHashSet; +import java.util.Set; + /** * Le modèle d'un écran d'édition * @@ -239,6 +245,14 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab firePropertyChange(PROPERTY_CAN_WRITE, oldValue, canWrite); } + public <D extends ReferentialDto> Set<ReferentialReferenceDto<D>> getReferentialReferences(Class<D> type, String name) { + + ReferenceSetDto<D> referenceSetDto1 = formDto.getReferenceSetDto(type, name); + LinkedHashSet<ReferentialReferenceDto<D>> reference = (LinkedHashSet)referenceSetDto1.getReference(); + return reference; + + } + protected void firePropertyChange(String propertyName, Object newValue) { firePropertyChange(propertyName, null, newValue); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 67b2006..1478989 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -26,8 +26,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; -import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.entities.longline.SectionTemplate; import fr.ird.observe.entities.longline.SectionWithTemplate; import fr.ird.observe.entities.longline.SectionWithTemplates; @@ -82,6 +82,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong static private Log log = LogFactory.getLog(LonglineDetailCompositionUIHandler.class); private final PropertyChangeListener sectionTemplatesTableModelModified = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { Boolean newValue = (Boolean) evt.getNewValue(); @@ -90,6 +91,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final PropertyChangeListener sectionsTableModelModified = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { Boolean newValue = (Boolean) evt.getNewValue(); @@ -98,6 +100,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final TableModelListener sectionsTableModelChanged = new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { SectionsTableModel source = (SectionsTableModel) e.getSource(); @@ -106,6 +109,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final PropertyChangeListener branchlineDetailChanged = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { @@ -124,6 +128,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final PropertyChangeListener basketsTableModelModified = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { Boolean newValue = (Boolean) evt.getNewValue(); @@ -132,6 +137,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final TableModelListener basketsTableModelChanged = new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { BasketsTableModel source = (BasketsTableModel) e.getSource(); @@ -140,6 +146,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final PropertyChangeListener branchinesTableModelModified = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { onBranchlinesTableModelModified((Boolean) evt.getNewValue()); @@ -147,6 +154,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final TableModelListener branchinesTableModelChanged = new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { BranchlinesTableModel source = (BranchlinesTableModel) e.getSource(); @@ -155,6 +163,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final PropertyChangeListener selectedBranchlineChanged = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { BranchlineDto previousValue = (BranchlineDto) evt.getOldValue(); @@ -164,6 +173,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final ChangeListener tabbedPaneChanged = new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { JVetoableTabbedPane source = (JVetoableTabbedPane) e.getSource(); @@ -200,6 +210,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong private boolean sectionAdjusting; private final PropertyChangeListener modelCanGenerateChanged = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { @@ -216,6 +227,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong }; private final PropertyChangeListener selectedSectionChanged = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { @@ -238,6 +250,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong private boolean basketAdjusting; private final PropertyChangeListener selectedBasketChanged = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { @@ -262,6 +275,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong private boolean onOpen; private JVetoableTabbedPane.ChangeSelectedIndex tabbedPaneWillChanged = new JVetoableTabbedPane.ChangeSelectedIndex() { + @Override public boolean canChangeTab(int currentSelectedIndex, int newSelectedIndex) { return onTabWillChanged(currentSelectedIndex, newSelectedIndex); @@ -398,19 +412,14 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong SetLonglineDetailCompositionService setLonglineService = getSetLonglineDetailCompositionService(); - FormDto<SetLonglineDetailCompositionDto> setLonglineDtoFormDto; - if (mode == ContentMode.READ) { - setLonglineDtoFormDto = setLonglineService.loadToRead(setId); - - } else { - setLonglineDtoFormDto = setLonglineService.loadToEdit(setId); - } + FormDto<SetLonglineDetailCompositionDto> setLonglineDtoFormDto = setLonglineService.loadForm(setId); getModel().setFormDto(setLonglineDtoFormDto); SetLonglineDetailCompositionDto bean = getBean(); SetLonglineDetailCompositionDtos.copySetLonglineDetailCompositionDto(setLonglineDtoFormDto.getForm(), bean); - FormDto<BranchlineDto> branchlineDtoFormDto = FormDtos.newFormDto(BranchlineDto.class, null, setLonglineDtoFormDto.getLabels()); + //FIXME Voir comment gérer ça + FormDto<BranchlineDto> branchlineDtoFormDto = FormDtos.newFormDto(BranchlineDto.class, null, null, null); getUi().getBranchlineDetailUI().getModel().setFormDto(branchlineDtoFormDto); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index 9e8ce1e..2144003 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -143,7 +143,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong ContentMode mode = computeContentMode(); // update mode - FormDto<SetLonglineGlobalCompositionDto> formDto = getSetLonglineGlobalCompositionService().loadToEdit(setId); + FormDto<SetLonglineGlobalCompositionDto> formDto = getSetLonglineGlobalCompositionService().loadForm(setId); getModel().setFormDto(formDto); SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(formDto.getForm(), getBean()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index d5d88bd..1467bb2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -225,7 +225,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } else { // update mode - formDto = getSetLonglineService().loadToEdit(setId); + formDto = getSetLonglineService().loadForm(setId); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java index 2463da4..0591cab 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java @@ -87,12 +87,12 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ ContentMode mode = computeContentMode(); - FormDto<ActivitySeineObservedSystemDto> formDto = getActivitySeineObservedSystemService().loadToEdit(activityId); + getModel().setMode(mode); + + FormDto<ActivitySeineObservedSystemDto> formDto = getActivitySeineObservedSystemService().loadForm(activityId); getModel().setFormDto(formDto); ActivitySeineObservedSystemDtos.copyActivitySeineObservedSystemDto(formDto.getForm(), getBean()); - getModel().setMode(mode); - if (mode == ContentMode.UPDATE) { getUi().startEdit(null); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 1b5a244..3ef90fc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -119,7 +119,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH getModel().setEditing(false); - FormDto<FloatingObjectTransmittingBuoyDto> formDto = getTransmittingBuoyOperationService().loadToEdit(dcpId); + FormDto<FloatingObjectTransmittingBuoyDto> formDto = getTransmittingBuoyOperationService().loadForm(dcpId); getModel().setFormDto(formDto); FloatingObjectTransmittingBuoyDtos.copyFloatingObjectTransmittingBuoyDto(formDto.getForm(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index e9d4fcc..d0b926e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -119,7 +119,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } else { // update mode - formDto = getFloatingObjectService().loadToEdit(dcpId); + formDto = getFloatingObjectService().loadForm(dcpId); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 8d8c1ea..d449680 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -179,7 +179,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } else { // update mode - formDto = getSetSeineService().loadToEdit(setId); + formDto = getSetSeineService().loadForm(setId); } @@ -187,7 +187,9 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { SetSeineDtos.copySetSeineDto(formDto.getForm(), bean); RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); - FormDto<RouteDto> route = routeService.loadToRead(selectedRouteId); + //FIXME ! Pourquoi donc récupérer le formulaire d'une route ici ? juste remonter la donnée dont on a + //FIXME besoin depuis le service + FormDto<RouteDto> route = routeService.loadForm(selectedRouteId); Date time = bean.getStartTime(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 620c684..d20e932 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -130,7 +130,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin @Override protected void loadParentBean() { TripLonglineService service = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); - FormDto<TripLonglineDto> tripLonglineDtoFormDto = service.loadToEdit(getSelectedParentId()); + FormDto<TripLonglineDto> tripLonglineDtoFormDto = service.loadForm(getSelectedParentId()); getModel().setFormDto(tripLonglineDtoFormDto); TripLonglineDtos.copyTripLonglineDto(tripLonglineDtoFormDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index b0f1701..7adb4c1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -127,7 +127,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected void loadParentBean() { RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); - FormDto<RouteDto> routeDtoFormDto = service.loadToEdit(getSelectedParentId()); + FormDto<RouteDto> routeDtoFormDto = service.loadForm(getSelectedParentId()); getModel().setFormDto(routeDtoFormDto); RouteDtos.copyRouteDto(routeDtoFormDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 0b26e67..e0424d7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -181,7 +181,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } else { // update mode - formDto = getActivityLonglineService().loadToEdit(activityId); + formDto = getActivityLonglineService().loadForm(activityId); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index 695cd74..783bd67 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -192,7 +192,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline } // update mode - formDto = getTripLonglineService().loadToEdit(tripId); + formDto = getTripLonglineService().loadForm(tripId); } setContentMode(mode); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index ba98e15..dba9572 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -209,7 +209,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } else { // update mode - formDto = getActivitySeineService().loadToEdit(activityId); + formDto = getActivitySeineService().loadForm(activityId); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index 0e043aa..bde2aca 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -142,7 +142,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } else { // update mode - formDto = getRouteService().loadToEdit(routeId); + formDto = getRouteService().loadForm(routeId); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index a4f40db..2c984f7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -511,7 +511,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat @Override protected void loadEditBean(String beanId) { - FormDto<SetLonglineCatchDto> formDto = getSetLonglineCatchService().loadToEdit(beanId); + FormDto<SetLonglineCatchDto> formDto = getSetLonglineCatchService().loadForm(beanId); getModel().setFormDto(formDto); LonglinePositionHelper<CatchLonglineDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); @@ -730,7 +730,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat log.info("Use branchline: " + newValue); } - FormDto<BranchlineDto> formDto = getBranchLineService().loadToEdit(newValue.getId()); + FormDto<BranchlineDto> formDto = getBranchLineService().loadForm(newValue.getId()); BranchlineDtos.copyBranchlineDto(formDto.getForm(), branchline); if (ui.getValidator().getBean() == null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java index c873ad5..1f373fc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java @@ -106,7 +106,7 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn @Override protected void loadEditBean(String beanId) { - FormDto<ActivityLonglineEncouterDto> formDto = getActivityLongLineEncouterService().loadToEdit(beanId); + FormDto<ActivityLonglineEncouterDto> formDto = getActivityLongLineEncouterService().loadForm(beanId); getModel().setFormDto(formDto); ActivityLonglineEncouterDtos.copyActivityLonglineEncouterDto(formDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 9445037..b7d0938 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -494,7 +494,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip @Override protected void loadEditBean(String beanId) { - FormDto<TripLonglineGearUseDto> formDto = getTripLonglineGearUseService().loadToEdit(beanId); + FormDto<TripLonglineGearUseDto> formDto = getTripLonglineGearUseService().loadForm(beanId); getModel().setFormDto(formDto); TripLonglineGearUseDtos.copyTripLonglineGearUseDto(formDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java index 97224d2..b37c9a6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -113,6 +113,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReferenceDto.class, SensorDataFormatDto.class.getSimpleName())); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newBooleanTableCellRenderer(renderer, new Predicate<Object>() { + @Override public boolean apply(Object input) { return input != null; @@ -165,7 +166,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS t("observe.sensorUsed.delete.data.message"), JOptionPane.WARNING_MESSAGE, new Object[]{t("observe.choice.confirm.delete"), - t("observe.choice.cancel")}, + t("observe.choice.cancel")}, 1); boolean doDelete = response == 0; @@ -234,7 +235,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS @Override protected void loadEditBean(String beanId) { - FormDto<ActivityLonglineSensorUsedDto> formDto = getActivityLonglineSensorUsedService().loadToEdit(beanId); + FormDto<ActivityLonglineSensorUsedDto> formDto = getActivityLonglineSensorUsedService().loadForm(beanId); getModel().setFormDto(formDto); ActivityLonglineSensorUsedDtos.copyActivityLonglineSensorUsedDto(formDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java index 34df2b7..20625b7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java @@ -465,7 +465,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt @Override protected void loadEditBean(String beanId) { - FormDto<SetLonglineTdrDto> formDto = getTdrService().loadToEdit(beanId); + FormDto<SetLonglineTdrDto> formDto = getTdrService().loadForm(beanId); getModel().setFormDto(formDto); LonglinePositionHelper<TdrDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index 36c4d74..eeb8893 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx @@ -34,6 +34,7 @@ fr.ird.observe.services.dto.seine.TripSeineGearUseDto fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.ui.content.table.* fr.ird.observe.ui.util.BooleanEditor @@ -100,7 +101,7 @@ <JLabel id='gearLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='gear' constructorParams='this' genericType='ReferenceDto<GearDto>' _entityClass='GearDto.class'/> + <BeanComboBox id='gear' constructorParams='this' genericType='ReferentialReferenceDto<GearDto>' _entityClass='GearDto.class'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index c76fbe8..b0f80b2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -92,6 +92,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { @@ -283,6 +284,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei super.initUI(); getModel().addPropertyChangeListener(GearUseFeaturesSeineUIModel.PROPERTY_EDITABLE, new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { Boolean newValue = (Boolean) evt.getNewValue(); @@ -345,7 +347,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei if (!selectionEmpty) { - GearUseFeaturesMeasurementSeineDto data = tableModel.getSelectedRow(); + GearUseFeaturesMeasurementSeineDto data = tableModel.getSelectedRow(); if (log.isInfoEnabled()) { log.info("Delete: " + data); @@ -467,14 +469,15 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei List<GearUseFeaturesMeasurementSeineDto> measurements = Lists.newArrayList( Iterables.transform(gearDto.getGearCaracteristic(), - new Function<ReferentialReferenceDto<GearCaracteristicDto>, GearUseFeaturesMeasurementSeineDto>() { - @Override - public GearUseFeaturesMeasurementSeineDto apply(ReferentialReferenceDto<GearCaracteristicDto> input) { - GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto(); - measurementSeineDto.setGearCaracteristic(input); - return measurementSeineDto; - } - })); + new Function<ReferentialReferenceDto<GearCaracteristicDto>, GearUseFeaturesMeasurementSeineDto>() { + + @Override + public GearUseFeaturesMeasurementSeineDto apply(ReferentialReferenceDto<GearCaracteristicDto> input) { + GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto(); + measurementSeineDto.setGearCaracteristic(input); + return measurementSeineDto; + } + })); return measurements; @@ -488,7 +491,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei @Override protected void loadEditBean(String beanId) { - FormDto<TripSeineGearUseDto> formDto = getTripSeineGearUseService().loadToEdit(beanId); + FormDto<TripSeineGearUseDto> formDto = getTripSeineGearUseService().loadForm(beanId); getModel().setFormDto(formDto); TripSeineGearUseDtos.copyTripSeineGearUseDto(formDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx index b9d95ad..471c6fe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -35,6 +35,7 @@ fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto fr.ird.observe.services.dto.seine.NonTargetCatchDto fr.ird.observe.services.dto.referential.seine.SpeciesFateDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.ui.content.table.* @@ -90,7 +91,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='species' constructorParams='this' genericType='ReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> + <BeanComboBox id='species' constructorParams='this' genericType='ReferentialReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> </cell> </row> @@ -100,7 +101,7 @@ <JLabel id='speciesFateLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='speciesFate' constructorParams='this' genericType='ReferenceDto<SpeciesFateDto>' _entityClass='SpeciesFateDto.class'/> + <BeanComboBox id='speciesFate' constructorParams='this' genericType='ReferentialReferenceDto<SpeciesFateDto>' _entityClass='SpeciesFateDto.class'/> </cell> </row> @@ -110,7 +111,7 @@ <JLabel id='reasonForDiscardLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReferenceDto<ReasonForDiscardDto>' _entityClass='ReasonForDiscardDto.class'/> + <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReferentialReferenceDto<ReasonForDiscardDto>' _entityClass='ReasonForDiscardDto.class'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index d039447..2e6102a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -28,7 +28,6 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -52,6 +51,7 @@ import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -75,6 +75,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa * @since 3.0 */ protected final PropertyChangeListener totalCountChanged = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); @@ -90,6 +91,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa * @since 3.0 */ protected final PropertyChangeListener catchWeightChanged = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); @@ -105,6 +107,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa * @since 3.0 */ protected final PropertyChangeListener meanWeightChanged = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); @@ -120,6 +123,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa * @since 3.0 */ protected final PropertyChangeListener meanLengthChanged = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); @@ -207,9 +211,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa } @Override - protected void onSelectedRowChanged(int editingRow, - NonTargetCatchDto bean, - boolean create) { + protected void onSelectedRowChanged(int editingRow, NonTargetCatchDto bean, boolean create) { NonTargetCatchUI ui = getUi(); ContentTableModel<SetSeineNonTargetCatchDto, NonTargetCatchDto> model = getTableModel(); @@ -220,18 +222,18 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa return; } - List<ReferenceDto<SpeciesDto>> availableEspeces; + List<ReferentialReferenceDto<SpeciesDto>> availableEspeces; JComponent requestFocus; if (create) { - ReferenceSetDto<SpeciesDto> speciesDtoReferenceSetDto = getModel().getFormDto().getReferenceSetDto(SpeciesDto.class); - Set<ReferenceDto<SpeciesDto>> speciesSet = (Set) speciesDtoReferenceSetDto.getReference(); + Set<ReferentialReferenceDto<SpeciesDto>> speciesSet = getModel().getReferentialReferences(SpeciesDto.class, NonTargetCatchDto.PROPERTY_SPECIES); availableEspeces = Lists.newArrayList(speciesSet); requestFocus = ui.getSpecies(); } else { - ReferenceDto<SpeciesDto> species = bean.getSpecies(); - availableEspeces = Lists.newArrayList(species); + ReferentialReferenceDto<SpeciesDto> species = bean.getSpecies(); + availableEspeces = new ArrayList<>(); + availableEspeces.add(species); requestFocus = ui.getTable(); } @@ -364,7 +366,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa @Override protected void loadEditBean(String beanId) { String tripSeineId = getDataContext().getSelectedTripSeineId(); - FormDto<SetSeineNonTargetCatchDto> formDto = getNonTargetCatchService().loadToEdit(beanId, tripSeineId); + FormDto<SetSeineNonTargetCatchDto> formDto = getNonTargetCatchService().loadForm(beanId, tripSeineId); getModel().setFormDto(formDto); SetSeineNonTargetCatchDtos.copySetSeineNonTargetCatchDto(formDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index 40eeca8..b9d9ca3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -34,6 +34,7 @@ fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.seine.NonTargetLengthDto fr.ird.observe.services.dto.seine.NonTargetSampleDto fr.ird.observe.ui.content.table.impl.seine.ModeSaisieEchantillonEnum @@ -123,7 +124,7 @@ public String getSpeciesFauneTypeTaille(ReferenceDto<SpeciesDto> species) { <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' constructorParams='this' genericType='ReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> + <BeanComboBox id='species' constructorParams='this' genericType='ReferentialReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> </cell> </row> @@ -185,7 +186,7 @@ public String getSpeciesFauneTypeTaille(ReferenceDto<SpeciesDto> species) { <JLabel id='sexLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='sex' genericType='ReferenceDto<SexDto>' _entityClass='SexDto.class' constructorParams='this'/> + <BeanComboBox id='sex' genericType='ReferentialReferenceDto<SexDto>' _entityClass='SexDto.class' constructorParams='this'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 7e67baa..54e7e1f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -27,7 +27,7 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; @@ -129,12 +129,12 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam return; } - ReferenceDto<SpeciesDto> species = bean.getSpecies(); + ReferentialReferenceDto<SpeciesDto> species = bean.getSpecies(); NonTargetSampleUI ui = getUi(); if (log.isDebugEnabled()) { log.debug("selected species " + species); } - List<ReferenceDto<SpeciesDto>> availableEspeces; + List<ReferentialReferenceDto<SpeciesDto>> availableEspeces; JComponent requestFocus; if (create) { @@ -146,9 +146,9 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam ui.getAcquisitionModeGroup().setSelectedValue(ModeSaisieEchantillonEnum.byEffectif); } - ReferenceSetDto<SpeciesDto> speciesSetDto = getModel().getFormDto().getReferenceSetDto(SpeciesDto.class); + Set<ReferentialReferenceDto<SpeciesDto>> speciesReferences = getModel().getReferentialReferences(SpeciesDto.class, NonTargetLengthDto.PROPERTY_SPECIES); - availableEspeces = Lists.newArrayList((Set) speciesSetDto.getReference()); + availableEspeces = Lists.newArrayList(speciesReferences); requestFocus = ui.getSpecies(); } else { @@ -299,7 +299,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam @Override protected void loadEditBean(String beanId) { - FormDto<NonTargetSampleDto> formDto = getNonTargetSampleService().loadToEdit(beanId); + FormDto<NonTargetSampleDto> formDto = getNonTargetSampleService().loadForm(beanId); getModel().setFormDto(formDto); NonTargetSampleDtos.copyNonTargetSampleDto(formDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx index 4de6832..e7110c7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx @@ -33,6 +33,7 @@ fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto fr.ird.observe.ui.content.table.* @@ -84,7 +85,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='species' constructorParams='this' - genericType='ReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> + genericType='ReferentialReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> </cell> </row> @@ -95,7 +96,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='speciesStatus' constructorParams='this' - genericType='ReferenceDto<SpeciesStatusDto>' _entityClass='SpeciesStatusDto.class'/> + genericType='ReferentialReferenceDto<SpeciesStatusDto>' _entityClass='SpeciesStatusDto.class'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 1e2daaf..37d5e2a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -99,7 +99,7 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati @Override protected void loadEditBean(String beanId) { - FormDto<FloatingObjectObservedSpeciesDto> formDto = getObjectObservedSpeciesService().loadToEdit(beanId); + FormDto<FloatingObjectObservedSpeciesDto> formDto = getObjectObservedSpeciesService().loadForm(beanId); getModel().setFormDto(formDto); FloatingObjectObservedSpeciesDtos.copyFloatingObjectObservedSpeciesDto(formDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx index df2d78e..6be0ca7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx @@ -33,6 +33,7 @@ fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.table.* @@ -83,7 +84,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='species' constructorParams='this' - genericType='ReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> + genericType='ReferentialReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index e0acd0b..d80cebd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -95,7 +95,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin @Override protected void loadEditBean(String beanId) { - FormDto<FloatingObjectSchoolEstimateDto> formDto = getObjectSchoolEstimateService().loadToEdit(beanId); + FormDto<FloatingObjectSchoolEstimateDto> formDto = getObjectSchoolEstimateService().loadForm(beanId); getModel().setFormDto(formDto); FloatingObjectSchoolEstimateDtos.copyFloatingObjectSchoolEstimateDto(formDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx index 685f865..59d8430 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx @@ -35,6 +35,7 @@ fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto fr.ird.observe.services.dto.seine.SchoolEstimateDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.table.* @@ -88,7 +89,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='ReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class' + <BeanComboBox id='species' genericType='ReferentialReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class' constructorParams='this'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index f5a917f..50a9bc8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -25,13 +25,11 @@ import com.google.common.base.Predicates; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; @@ -48,6 +46,7 @@ import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Set; @@ -88,26 +87,25 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo } SchoolEstimateUI ui = getUi(); - Set<ReferenceDto<SpeciesDto>> availableEspeces; + List<ReferentialReferenceDto<SpeciesDto>> availableEspeces; JComponent requestFocus; if (create) { - ReferenceSetDto<SpeciesDto> referenceSetDto = getModel().getFormDto().getReferenceSetDto(SpeciesDto.class); - Set<ReferenceDto<SpeciesDto>> references = (Set) referenceSetDto.getReference(); + Set<ReferentialReferenceDto<SpeciesDto>> references = getModel().getReferentialReferences(SpeciesDto.class, SchoolEstimateDto.PROPERTY_SPECIES); List<ReferentialReferenceDto<SpeciesDto>> listSpeciesUsed = model.getColumnValues(0); Collection<String> listSpeciesIdUsed = Collections2.transform(listSpeciesUsed, IdDtos.getIdFunction()); - availableEspeces = Sets.newHashSet(Iterables.filter(references, Predicates.not(IdDtos.newIdsPredicate(listSpeciesIdUsed)))); + availableEspeces = Lists.newArrayList(Iterables.filter(references, Predicates.not(IdDtos.newIdsPredicate(listSpeciesIdUsed)))); requestFocus = ui.getSpecies(); } else { - ReferenceDto<SpeciesDto> species = bean.getSpecies(); - availableEspeces = Sets.newHashSet(species); + ReferentialReferenceDto<SpeciesDto> species = bean.getSpecies(); + availableEspeces = Collections.singletonList(species); requestFocus = ui.getTotalWeight(); } - ui.getSpecies().setData(Lists.newArrayList(availableEspeces)); + ui.getSpecies().setData(availableEspeces); requestFocus.requestFocus(); } @@ -137,7 +135,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo @Override protected void loadEditBean(String beanId) { String tripSeineId = getDataContext().getSelectedTripSeineId(); - FormDto<SetSeineSchoolEstimateDto> formDto = getSchoolEstimateService().loadToEdit(beanId, tripSeineId); + FormDto<SetSeineSchoolEstimateDto> formDto = getSchoolEstimateService().loadForm(beanId, tripSeineId); getModel().setFormDto(formDto); SetSeineSchoolEstimateDtos.copySetSeineSchoolEstimateDto(formDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx index 193fb48..b1018ee 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx @@ -33,8 +33,9 @@ fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto fr.ird.observe.services.dto.seine.TargetCatchDto - fr.ird.observe.services.dto.referential.seine.WeightCategoryDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.seine.WeightCategoryDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -86,7 +87,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='ReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class' constructorParams='this'/> + <BeanComboBox id='species' genericType='ReferentialReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class' constructorParams='this'/> </cell> </row> @@ -97,7 +98,7 @@ <JLabel id='weightCategoryLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='weightCategory' genericType='ReferenceDto<WeightCategoryDto>' _entityClass='WeightCategoryDto.class' constructorParams='this'/> + <BeanComboBox id='weightCategory' genericType='ReferentialReferenceDto<WeightCategoryDto>' _entityClass='WeightCategoryDto.class' constructorParams='this'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java index d1486ad..dc16e4e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -29,7 +29,6 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; @@ -53,7 +52,6 @@ import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Set; @@ -104,7 +102,6 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa ReferentialReferenceDto<SpeciesDto> species = (ReferentialReferenceDto<SpeciesDto>) evt.getNewValue(); - onEspeceChanged(species); } } @@ -120,7 +117,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa @Override protected boolean prepareSave(SetSeineTargetCatchDto bean, List<TargetCatchDto> objets) { - //on cherche si parmis les captures supprimer certaines ont des échantillon + // on cherche si parmis les captures supprimer certaines ont des échantillons SetSeineTargetCatchDto originalSetSeineTargetCatchDto = getModel().getFormDto().getForm(); SetSeineTargetCatchDto currentSetSeineTargetCatch = getModel().getBean(); @@ -145,8 +142,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa if (!speciesToDelete.isEmpty()) { - // il existe des echantillon thon a supprimer on demande une - // confirmation + // il existe des echantillons thon a supprimer on demande une confirmation StringBuilder sb = new StringBuilder(512); Decorator<ReferenceDto> decorator = getDecoratorService().getDecoratorByType(ReferenceDto.class, SpeciesDto.class.getSimpleName()); @@ -187,23 +183,21 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa TargetCatchUI ui = getUi(); - ReferenceDto<WeightCategoryDto> beanWeightCategory = bean.getWeightCategory(); + ReferentialReferenceDto<WeightCategoryDto> beanWeightCategory = bean.getWeightCategory(); - ReferenceDto<SpeciesDto> beanSpecies = null; - if (beanWeightCategory != null) { - beanSpecies = (ReferenceDto<SpeciesDto>) beanWeightCategory.getPropertyValue(WeightCategoryDto.PROPERTY_SPECIES); + ReferentialReferenceDto<SpeciesDto> beanSpecies = null; + if (beanWeightCategory != null) { + beanSpecies = (ReferentialReferenceDto<SpeciesDto>) beanWeightCategory.getPropertyValue(WeightCategoryDto.PROPERTY_SPECIES); } JComponent requestFocus; if (create) { - // on reinitilise toujours l'species (pour reinitialiser la liste - // des categories) + // on reinitilise toujours l'espèce (pour reinitialiser la liste des categories) ui.getSpecies().setSelectedItem(null); if (!getTableModel().isCreate()) { - // on repositionne l'species (cela reconstruira la liste - // des categories) + // on repositionne l'espèce (cela reconstruira la liste des categories) ui.getSpecies().setSelectedItem(beanSpecies); // on repositionne la categorie ui.getWeightCategory().setSelectedItem(beanWeightCategory); @@ -218,8 +212,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa // puisque dans ce mode, pas possibilite de modifier de cette // valeur (clef metier) ui.getSpecies().setSelectedItem(beanSpecies); - ui.getWeightCategory().setData( - Arrays.asList(beanWeightCategory)); + ui.getWeightCategory().setData(Collections.singletonList(beanWeightCategory)); ui.getWeightCategory().setSelectedItem(beanWeightCategory); requestFocus = ui.getCatchWeight(); @@ -264,35 +257,34 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa @SuppressWarnings("unchecked") protected void onEspeceChanged(final ReferentialReferenceDto<SpeciesDto> species) { - List<ReferenceDto<WeightCategoryDto>> availableCategories; + List<ReferentialReferenceDto<WeightCategoryDto>> availableCategories; if (species == null) { - // aucune species selectionnee, on vide simplement + // aucune espèce selectionnee, on vide simplement // la liste des categories car il faut d'abord choisir une - // species puis une categorie + // espèce puis une categorie availableCategories = Collections.emptyList(); } else { // un species est selectionnee, - // on calcule les categories pour cette species + // on calcule les categories pour cette espèce - ReferenceSetDto<WeightCategoryDto> weightCategoryDtoReferenceSetDto = getModel().getFormDto().getReferenceSetDto(WeightCategoryDto.class); + Set<ReferentialReferenceDto<WeightCategoryDto>> allCategories = getModel().getReferentialReferences(WeightCategoryDto.class, TargetCatchDto.PROPERTY_SPECIES); - Set<ReferenceDto<WeightCategoryDto>> allCategories = (Set) weightCategoryDtoReferenceSetDto.getReference(); + // on ne conserve que les categories de l'espèce + availableCategories = Lists.newArrayList(Iterables.filter(allCategories, new Predicate<ReferentialReferenceDto<WeightCategoryDto>>() { - // on ne conserve que les categories de l'species - availableCategories = Lists.newArrayList(Iterables.filter(allCategories, new Predicate<ReferenceDto<WeightCategoryDto>>() { @Override - public boolean apply(ReferenceDto<WeightCategoryDto> input) { + public boolean apply(ReferentialReferenceDto<WeightCategoryDto> input) { return species.equals(input.getPropertyValue(WeightCategoryDto.PROPERTY_SPECIES)); } })); } // on met a jour la liste des categories disponibles - BeanComboBox<ReferenceDto<WeightCategoryDto>> combo = getUi().getWeightCategory(); + BeanComboBox<ReferentialReferenceDto<WeightCategoryDto>> combo = getUi().getWeightCategory(); combo.setData(availableCategories); // on reinitialise toujours la categorie selectionnee @@ -310,7 +302,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa String tripSeineId = getDataContext().getSelectedTripSeineId(); - FormDto<SetSeineTargetCatchDto> formDto = getTargetCatchService().loadToEdit(beanId, false, tripSeineId); + FormDto<SetSeineTargetCatchDto> formDto = getTargetCatchService().loadForm(beanId, false, tripSeineId); getModel().setFormDto(formDto); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx index 8ea3383..911e664 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx @@ -33,9 +33,10 @@ fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto fr.ird.observe.services.dto.seine.TargetCatchDto - fr.ird.observe.services.dto.referential.seine.WeightCategoryDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto + fr.ird.observe.services.dto.referential.seine.WeightCategoryDto fr.ird.observe.ui.content.table.* fr.ird.observe.ui.util.BooleanEditor @@ -87,7 +88,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' constructorParams='this' genericType='ReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> + <BeanComboBox id='species' constructorParams='this' genericType='ReferentialReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class'/> </cell> </row> @@ -97,7 +98,7 @@ <JLabel id='weightCategoryLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='weightCategory' constructorParams='this' genericType='ReferenceDto<WeightCategoryDto>' _entityClass='WeightCategoryDto.class'/> + <BeanComboBox id='weightCategory' constructorParams='this' genericType='ReferentialReferenceDto<WeightCategoryDto>' _entityClass='WeightCategoryDto.class'/> </cell> </row> @@ -107,7 +108,7 @@ <JLabel id='reasonForDiscardLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReferenceDto<ReasonForDiscardDto>' _entityClass='ReasonForDiscardDto.class'/> + <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReferentialReferenceDto<ReasonForDiscardDto>' _entityClass='ReasonForDiscardDto.class'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 029018f..f56b866 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -28,7 +28,6 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; @@ -53,7 +52,6 @@ import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Iterator; @@ -76,20 +74,20 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT super(ui, DataContextType.SetSeine); } - protected static Collection<ReferenceDto<WeightCategoryDto>> getWeightCategoryUsed( + protected static Collection<ReferentialReferenceDto<WeightCategoryDto>> getWeightCategoryUsed( ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model) { - List<ReferenceDto<WeightCategoryDto>> list = model.getColumnValues(1); - Collection<ReferenceDto<WeightCategoryDto>> set = Sets.newHashSet(list); + List<ReferentialReferenceDto<WeightCategoryDto>> list = model.getColumnValues(1); + Collection<ReferentialReferenceDto<WeightCategoryDto>> set = Sets.newHashSet(list); list.clear(); return set; } - protected static Collection<ReferenceDto<ReasonForDiscardDto>> getReasonForDiscardUsed( + protected static Collection<ReferentialReferenceDto<ReasonForDiscardDto>> getReasonForDiscardUsed( ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model, - ReferenceDto<WeightCategoryDto> weightCategory) { + ReferentialReferenceDto<WeightCategoryDto> weightCategory) { - Collection<ReferenceDto<ReasonForDiscardDto>> set = Sets.newHashSet(); + Collection<ReferentialReferenceDto<ReasonForDiscardDto>> set = Sets.newHashSet(); if (weightCategory != null) { for (int i = 0; i < model.getRowCount(); i++) { TargetCatchDto c = model.getValueAt(i); @@ -131,10 +129,9 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT TargetCatchDto bean = model.getRowBean(); if (bean.getId() == null) { - // en mode creation , on doit recalculer la liste - // des categories + // en mode creation , on doit recalculer la liste des categories - ReferenceDto<SpeciesDto> species = (ReferenceDto<SpeciesDto>) evt.getNewValue(); + ReferentialReferenceDto<SpeciesDto> species = (ReferentialReferenceDto<SpeciesDto>) evt.getNewValue(); onEspeceChanged(bean, species); } } @@ -158,8 +155,8 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT if (bean.getId() == null) { // en mode creation , on doit recalculer la liste // des raison rejet - ReferenceDto<WeightCategoryDto> weightCategory = - (ReferenceDto<WeightCategoryDto>) evt.getNewValue(); + ReferentialReferenceDto<WeightCategoryDto> weightCategory = + (ReferentialReferenceDto<WeightCategoryDto>) evt.getNewValue(); onCategorieChanged(bean, weightCategory); } @@ -177,7 +174,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT @Override protected boolean prepareSave(SetSeineTargetCatchDto bean, List<TargetCatchDto> objets) { - //on cherche si parmis les captures supprimer certaines ont des échantillon + //on cherche si parmis les captures supprimer certaines ont des échantillons SetSeineTargetCatchDto originalSetSeineTargetCatchDto = getModel().getFormDto().getForm(); SetSeineTargetCatchDto currentSetSeineTargetCatch = getModel().getBean(); @@ -201,11 +198,10 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT } if (!speciesToDelete.isEmpty()) { - // il existe des echantillon thon a supprimer on demande une - // confirmation + // il existe des echantillon thon a supprimer on demande une confirmation StringBuilder sb = new StringBuilder(512); - Decorator<ReferenceDto> decorator = - getDecoratorService().getDecoratorByType(ReferenceDto.class, SpeciesDto.class.getSimpleName()); + Decorator<ReferentialReferenceDto<SpeciesDto>> decorator = + getDecoratorService().getReferenceDecorator(SpeciesDto.class); for (ReferentialReferenceDto<SpeciesDto> species : speciesToDelete) { sb.append(" - ").append(decorator.toString(species)).append('\n'); @@ -243,14 +239,14 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT protected void onSelectedRowChanged(int editingRow, TargetCatchDto bean, boolean create) { TargetDiscardCatchUI ui = getUi(); - ReferenceDto<WeightCategoryDto> beanWeightCategory = bean.getWeightCategory(); + ReferentialReferenceDto<WeightCategoryDto> beanWeightCategory = bean.getWeightCategory(); - ReferenceDto<SpeciesDto> beanSpecies = null; - if (beanWeightCategory != null) { - beanSpecies = (ReferenceDto<SpeciesDto>) beanWeightCategory.getPropertyValue(WeightCategoryDto.PROPERTY_SPECIES); + ReferentialReferenceDto<SpeciesDto> beanSpecies = null; + if (beanWeightCategory != null) { + beanSpecies = (ReferentialReferenceDto<SpeciesDto>) beanWeightCategory.getPropertyValue(WeightCategoryDto.PROPERTY_SPECIES); } - ReferenceDto<ReasonForDiscardDto> beanReasonForDiscard = bean.getReasonForDiscard(); + ReferentialReferenceDto<ReasonForDiscardDto> beanReasonForDiscard = bean.getReasonForDiscard(); if (log.isDebugEnabled()) { log.debug("selected categoriePoid " + beanWeightCategory); log.debug("selected species " + beanSpecies); @@ -262,22 +258,20 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel(); if (model.isCreate()) { - // par défaut, on considère que l'espèce a été monté sur le pont + // par défaut, on considère que l'espèce a été montée sur le pont // c'est le cas le plus fréquent. bean.setBroughtOnDeck(true); } // on recalcule la liste des speciess disponibles - List<ReferenceDto<SpeciesDto>> availableSpecies = buildEspeceList(beanSpecies, beanWeightCategory); + List<ReferentialReferenceDto<SpeciesDto>> availableSpecies = buildEspeceList(beanSpecies, beanWeightCategory); ui.getSpecies().setData(availableSpecies); - // on reinitilise toujours l'species (pour reinitialiser la liste - // des categories) + // on reinitilise toujours l'species (pour reinitialiser la liste des categories) ui.getSpecies().setSelectedItem(null); if (!model.isCreate()) { - // on repositionne l'species (cela reconstruira la liste - // des categories) + // on repositionne l'espèce (cela reconstruira la liste des categories) ui.getSpecies().setSelectedItem(beanSpecies); // on repositionne la categorie ui.getWeightCategory().setSelectedItem(beanWeightCategory); @@ -291,9 +285,9 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT // puisque dans ce mode, pas possibilite de modifier de cette // valeur (clef metier) ui.getSpecies().setSelectedItem(beanSpecies); - ui.getWeightCategory().setData(Arrays.asList(beanWeightCategory)); + ui.getWeightCategory().setData(Collections.singletonList(beanWeightCategory)); ui.getWeightCategory().setSelectedItem(beanWeightCategory); - ui.getReasonForDiscard().setData(Arrays.asList(beanReasonForDiscard)); + ui.getReasonForDiscard().setData(Collections.singletonList(beanReasonForDiscard)); ui.getReasonForDiscard().setSelectedItem(beanReasonForDiscard); requestFocus = ui.getCatchWeight(); @@ -332,26 +326,24 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT UIHelper.setTableColumnRenderer(table, 5, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } - protected void onEspeceChanged(TargetCatchDto bean, ReferenceDto<SpeciesDto> species) { + protected void onEspeceChanged(TargetCatchDto bean, ReferentialReferenceDto<SpeciesDto> species) { - ReferenceDto<WeightCategoryDto> weightCategory = null; + ReferentialReferenceDto<WeightCategoryDto> weightCategory = null; - List<ReferenceDto<WeightCategoryDto>> data; + List<ReferentialReferenceDto<WeightCategoryDto>> data; if (species == null) { - // aucune species selectionnee, on vide simplement - // la liste des categories car il faut d'abord choisir une - // species puis une categorie + // aucune espèce selectionnee, on vide simplement + // la liste des categories car il faut d'abord choisir une espèce puis une categorie data = Collections.emptyList(); } else { // un species est selectionne, on met a jour la liste des categories - // disponibles pour cet species + // disponibles pour cette espèce - List<ReferenceDto<WeightCategoryDto>> availableCategories = buildWeightCategoryList( - species); + List<ReferentialReferenceDto<WeightCategoryDto>> availableCategories = buildWeightCategoryList(species); data = availableCategories; @@ -364,23 +356,23 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT } // on met a jour le model de la liste des categories - BeanComboBox<ReferenceDto<WeightCategoryDto>> combo = getUi().getWeightCategory(); + BeanComboBox<ReferentialReferenceDto<WeightCategoryDto>> combo = getUi().getWeightCategory(); combo.setData(data); // on selectionne la categorie retenue combo.setSelectedItem(weightCategory); } - protected void onCategorieChanged(TargetCatchDto bean, ReferenceDto<WeightCategoryDto> weightCategory) { + protected void onCategorieChanged(TargetCatchDto bean, ReferentialReferenceDto<WeightCategoryDto> weightCategory) { TargetDiscardCatchUI ui = getUi(); - ReferenceDto<ReasonForDiscardDto> reasonForDiscard = null; - List<ReferenceDto<ReasonForDiscardDto>> data; + ReferentialReferenceDto<ReasonForDiscardDto> reasonForDiscard = null; + List<ReferentialReferenceDto<ReasonForDiscardDto>> data; if (weightCategory == null) { // aucune categorie selectionnee, on vide simplement // la liste des raison rejets car il faut d'abord choisir une - // species puis une categorie, puis une raison rejet + // espèce puis une categorie, puis une raison rejet data = Collections.emptyList(); } else { @@ -390,7 +382,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT reasonForDiscard = bean.getReasonForDiscard(); - List<ReferenceDto<ReasonForDiscardDto>> reasonForDiscardList = buildReasonFordiscardList(weightCategory, reasonForDiscard); + List<ReferentialReferenceDto<ReasonForDiscardDto>> reasonForDiscardList = buildReasonFordiscardList(weightCategory, reasonForDiscard); if (log.isDebugEnabled()) { log.debug("new reasonForDiscard list " + reasonForDiscardList); @@ -399,7 +391,6 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT data = reasonForDiscardList; - if (reasonForDiscard != null && !reasonForDiscardList.contains(reasonForDiscard)) { // on sélectionne la première raison rejet disponible @@ -407,7 +398,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT } } - BeanComboBox<ReferenceDto<ReasonForDiscardDto>> combo = ui.getReasonForDiscard(); + BeanComboBox<ReferentialReferenceDto<ReasonForDiscardDto>> combo = ui.getReasonForDiscard(); // on met a jour le model de la liste des raison rejets combo.setData(data); @@ -416,9 +407,10 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT combo.setSelectedItem(reasonForDiscard); } - protected List<ReferenceDto<SpeciesDto>> buildEspeceList(ReferenceDto<SpeciesDto> species, ReferenceDto<WeightCategoryDto> weightCategory) { + protected List<ReferentialReferenceDto<SpeciesDto>> buildEspeceList(ReferentialReferenceDto<SpeciesDto> species, + ReferentialReferenceDto<WeightCategoryDto> weightCategory) { - List<ReferenceDto<WeightCategoryDto>> weightCategoryList = getAllCategories(); + List<ReferentialReferenceDto<WeightCategoryDto>> weightCategoryList = getAllCategories(); removeFullyUsedCategories(weightCategoryList); @@ -426,25 +418,25 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT weightCategoryList.add(weightCategory); } - Collection<ReferenceDto<SpeciesDto>> usedEspeces = Sets.newHashSet(); - for (ReferenceDto<WeightCategoryDto> cat : weightCategoryList) { - usedEspeces.add((ReferenceDto<SpeciesDto>) cat.getPropertyValue(WeightCategoryDto.PROPERTY_SPECIES)); + Collection<ReferentialReferenceDto<SpeciesDto>> usedEspeces = Sets.newHashSet(); + for (ReferentialReferenceDto<WeightCategoryDto> cat : weightCategoryList) { + usedEspeces.add((ReferentialReferenceDto<SpeciesDto>) cat.getPropertyValue(WeightCategoryDto.PROPERTY_SPECIES)); } - List<ReferenceDto<SpeciesDto>> result = Lists.newArrayList(usedEspeces); + List<ReferentialReferenceDto<SpeciesDto>> result = Lists.newArrayList(usedEspeces); weightCategoryList.clear(); usedEspeces.clear(); return result; } - protected List<ReferenceDto<WeightCategoryDto>> buildWeightCategoryList(ReferenceDto<SpeciesDto> species) { + protected List<ReferentialReferenceDto<WeightCategoryDto>> buildWeightCategoryList(ReferentialReferenceDto<SpeciesDto> species) { - List<ReferenceDto<WeightCategoryDto>> weightCategoryList = getAllCategories(); + List<ReferentialReferenceDto<WeightCategoryDto>> weightCategoryList = getAllCategories(); // on filtre les categories sur l'espèce donnée - for (Iterator<ReferenceDto<WeightCategoryDto>> it = weightCategoryList.iterator(); + for (Iterator<ReferentialReferenceDto<WeightCategoryDto>> it = weightCategoryList.iterator(); it.hasNext(); ) { - ReferenceDto<WeightCategoryDto> weighte = it.next(); + ReferentialReferenceDto<WeightCategoryDto> weighte = it.next(); if (!species.equals(weighte.getPropertyValue(WeightCategoryDto.PROPERTY_SPECIES))) { it.remove(); } @@ -458,20 +450,20 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT } @SuppressWarnings("unchecked") - protected List<ReferenceDto<ReasonForDiscardDto>> buildReasonFordiscardList(ReferenceDto<WeightCategoryDto> weightCategory, ReferenceDto<ReasonForDiscardDto> currentReason) { + protected List<ReferentialReferenceDto<ReasonForDiscardDto>> buildReasonFordiscardList(ReferentialReferenceDto<WeightCategoryDto> weightCategory, ReferentialReferenceDto<ReasonForDiscardDto> currentReason) { ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel(); - ReferenceSetDto<ReasonForDiscardDto> reasonForDiscardSetDto = getModel().getFormDto().getReferenceSetDto(ReasonForDiscardDto.class); + Set<ReferentialReferenceDto<ReasonForDiscardDto>> reasonForDiscardSetDto = getModel().getReferentialReferences(ReasonForDiscardDto.class, TargetCatchDto.PROPERTY_REASON_FOR_DISCARD); - List<ReferenceDto<ReasonForDiscardDto>> reasonForDiscardList = Lists.newArrayList((Set) reasonForDiscardSetDto.getReference()); + List<ReferentialReferenceDto<ReasonForDiscardDto>> reasonForDiscardList = Lists.newArrayList(reasonForDiscardSetDto); // on filtre les raison rejet sur la categorie for (int i = 0; i < model.getRowCount(); i++) { TargetCatchDto c = model.getValueAt(i); if (c != null - && c.getReasonForDiscard() != null - && (currentReason == null || ! currentReason.equals(c.getReasonForDiscard())) - && weightCategory.equals(c.getWeightCategory())) { + && c.getReasonForDiscard() != null + && (currentReason == null || !currentReason.equals(c.getReasonForDiscard())) + && weightCategory.equals(c.getWeightCategory())) { reasonForDiscardList.remove(c.getReasonForDiscard()); } } @@ -479,27 +471,27 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT return reasonForDiscardList; } - protected List<ReferenceDto<WeightCategoryDto>> getAllCategories() { - ReferenceSetDto<WeightCategoryDto> weightCategorySetDto = getModel().getFormDto().getReferenceSetDto(WeightCategoryDto.class); + protected List<ReferentialReferenceDto<WeightCategoryDto>> getAllCategories() { + Set<ReferentialReferenceDto<WeightCategoryDto>> weightCategorySetDto = getModel().getReferentialReferences(WeightCategoryDto.class, TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); - List<ReferenceDto<WeightCategoryDto>> weightCategoryList = Lists.newArrayList((Set) weightCategorySetDto.getReference()); + List<ReferentialReferenceDto<WeightCategoryDto>> weightCategoryList = Lists.newArrayList(weightCategorySetDto); return weightCategoryList; } protected void removeFullyUsedCategories( - List<ReferenceDto<WeightCategoryDto>> weightCategoryAvaillable) { + List<ReferentialReferenceDto<WeightCategoryDto>> weightCategoryAvaillable) { ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel(); - ReferenceSetDto<ReasonForDiscardDto> reasonForDiscardSetDto = getModel().getFormDto().getReferenceSetDto(ReasonForDiscardDto.class); + Set<ReferentialReferenceDto<ReasonForDiscardDto>> reasonForDiscardSetDto = getModel().getReferentialReferences(ReasonForDiscardDto.class, TargetCatchDto.PROPERTY_REASON_FOR_DISCARD); - int nbReasonForDiscard = reasonForDiscardSetDto.sizeReference(); + int nbReasonForDiscard = reasonForDiscardSetDto.size(); // on filtre toutes les weightCategory qui ont deja references toutes // les raisons rejets - for (ReferenceDto<WeightCategoryDto> c : getWeightCategoryUsed(model)) { - Collection<ReferenceDto<ReasonForDiscardDto>> raisonUsed = getReasonForDiscardUsed(model, c); + for (ReferentialReferenceDto<WeightCategoryDto> c : getWeightCategoryUsed(model)) { + Collection<ReferentialReferenceDto<ReasonForDiscardDto>> raisonUsed = getReasonForDiscardUsed(model, c); if (raisonUsed.size() == nbReasonForDiscard) { // toutes les raison de rejet epuisé pour cette categorie weightCategoryAvaillable.remove(c); @@ -519,7 +511,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT String tripSeineId = getDataContext().getSelectedTripSeineId(); - FormDto<SetSeineTargetCatchDto> formDto = getTargetCatchService().loadToEdit(beanId, true, tripSeineId); + FormDto<SetSeineTargetCatchDto> formDto = getTargetCatchService().loadForm(beanId, true, tripSeineId); getModel().setFormDto(formDto); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx index 3575faf..14482d9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -32,6 +32,7 @@ fr.ird.observe.services.dto.seine.TargetLengthDto fr.ird.observe.ui.content.table.impl.seine.CodeMesureEnum fr.ird.observe.ui.content.table.impl.seine.ModeSaisieEchantillonEnum + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.table.* @@ -123,7 +124,7 @@ public String getLengthDataTip(boolean computed) { <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='ReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class' constructorParams='this'/> + <BeanComboBox id='species' genericType='ReferentialReferenceDto<SpeciesDto>' _entityClass='SpeciesDto.class' constructorParams='this'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java index 2f90d0b..9dfab19 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -26,6 +26,7 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -133,7 +134,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto return; } - ReferenceDto<SpeciesDto> species = bean.getSpecies(); + ReferentialReferenceDto<SpeciesDto> species = bean.getSpecies(); JComponent requestFocus; @@ -316,7 +317,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto @Override protected void loadEditBean(String beanId) { - FormDto<TargetSampleDto> formDto = getTargetSampleService().loadToEdit(beanId, discarded); + FormDto<TargetSampleDto> formDto = getTargetSampleService().loadForm(beanId, discarded); getModel().setFormDto(formDto); TargetSampleDtos.copyTargetSampleDto(formDto.getForm(), getBean()); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/TripMapDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/TripMapDtos.java new file mode 100644 index 0000000..458275a --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/TripMapDtos.java @@ -0,0 +1,15 @@ +package fr.ird.observe.services.dto; + + +import java.util.LinkedHashSet; + +public class TripMapDtos extends AbstractTripMapDtos { + + public static TripMapDto newTripMapDto(String tripId, LinkedHashSet<TripMapPointDto> points) { + TripMapDto tripMapDto = new TripMapDto(); + tripMapDto.setId(tripId); + tripMapDto.setPoints(points); + return tripMapDto; + } +} + -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.