This is an automated email from the git hooks/post-receive script. New commit to branch feature/7493_corrige_action_validation_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 56da77d79e9db7a7e569e5c5efa64d5bf4bd5626 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Wed Aug 24 10:30:12 2016 +0200 Renomme également les dto (ex: BasketWithSectionDto -> BasketWithSectionIdDto) refs #7493 --- .../table/impl/longline/LonglinePositionHelper.java | 12 ++++++------ ...thSectionDto.java => BasketWithSectionIdDto.java} | 2 +- ...BasketDto.java => BranchlineWithBasketIdDto.java} | 4 ++-- .../dto/reference/DataReferenceSetDefinitions.java | 20 ++++++++++---------- .../services/binder/BinderEngineInitializer.java | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java index c28e66b..fbe0daf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java @@ -25,9 +25,9 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.BasketDto; -import fr.ird.observe.services.dto.longline.BasketWithSectionDto; +import fr.ird.observe.services.dto.longline.BasketWithSectionIdDto; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.BranchlineWithBasketDto; +import fr.ird.observe.services.dto.longline.BranchlineWithBasketIdDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.LonglinePositionAwareDto; import fr.ird.observe.services.dto.longline.LonglinePositionSetDto; @@ -267,7 +267,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { protected DataReference<SectionDto> getSection(DataReference<BasketDto> basket) { - String sectionId = (String) basket.getPropertyValue(BasketWithSectionDto.PROPERTY_SECTION_ID); + String sectionId = (String) basket.getPropertyValue(BasketWithSectionIdDto.PROPERTY_SECTION_ID); DataReference<SectionDto> section = sectionUniverse.stream() // TODO sbavencoff 11/03/2016 utiliser le prédicat AbstractReference.newIdPredicate() @@ -282,7 +282,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { protected DataReference<BasketDto> getBasket(DataReference<BranchlineDto> branchline) { - String basketId = (String) branchline.getPropertyValue(BranchlineWithBasketDto.PROPERTY_BASKET_ID); + String basketId = (String) branchline.getPropertyValue(BranchlineWithBasketIdDto.PROPERTY_BASKET_ID); DataReference<BasketDto> basket = basketUniverse.stream() // TODO sbavencoff 11/03/2016 utiliser le prédicat DataReference.newLabelValuePredicate @@ -300,7 +300,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { List<DataReference<BasketDto>> baskets = basketUniverse.stream() // TODO sbavencoff 11/03/2016 utiliser le prédicat DataReference.newLabelValuePredicate // A la migartion vers les prédicat JAVA8 - .filter(b -> section.getId().equals(b.getPropertyValue(BasketWithSectionDto.PROPERTY_SECTION_ID))) + .filter(b -> section.getId().equals(b.getPropertyValue(BasketWithSectionIdDto.PROPERTY_SECTION_ID))) .collect(Collectors.toList()); return baskets; @@ -311,7 +311,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { List<DataReference<BranchlineDto>> branchlines = branchlineUniverse.stream() // TODO sbavencoff 11/03/2016 utilise le prédicat DataReference.newLabelValuePredicate // A la migartion vers les prédicat JAVA8 - .filter(b -> basket.getId().equals(b.getPropertyValue(BranchlineWithBasketDto.PROPERTY_BASKET_ID))) + .filter(b -> basket.getId().equals(b.getPropertyValue(BranchlineWithBasketIdDto.PROPERTY_BASKET_ID))) .collect(Collectors.toList()); return branchlines; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java similarity index 94% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionDto.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java index 615d1dc..d330f65 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionIdDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.longline; * #L% */ -public class BasketWithSectionDto extends BasketDto { +public class BasketWithSectionIdDto extends BasketDto { private static final long serialVersionUID = 3690753995685507632L; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java similarity index 87% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketDto.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java index b7b2856..0576507 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketIdDto.java @@ -22,10 +22,10 @@ package fr.ird.observe.services.dto.longline; * #L% */ -public class BranchlineWithBasketDto extends BranchlineDto { +public class BranchlineWithBasketIdDto extends BranchlineDto { private static final long serialVersionUID = 7018072108318352694L; - public static final String PROPERTY_BASKET_ID = "basket"; + public static final String PROPERTY_BASKET_ID = "basketId"; } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 634a886..ecb540a 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -27,9 +27,9 @@ import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; -import fr.ird.observe.services.dto.longline.BasketWithSectionDto; +import fr.ird.observe.services.dto.longline.BasketWithSectionIdDto; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.BranchlineWithBasketDto; +import fr.ird.observe.services.dto.longline.BranchlineWithBasketIdDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SectionDto; @@ -150,15 +150,15 @@ public enum DataReferenceSetDefinitions { .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)), - BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionDto.class) - .addProperty(Integer.class, BasketWithSectionDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BasketWithSectionDto.PROPERTY_SETTING_IDENTIFIER) - .addProperty(String.class, BasketWithSectionDto.PROPERTY_SECTION_ID)), + BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionIdDto.class) + .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)), - BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketDto.class) - .addProperty(Integer.class, BranchlineWithBasketDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BranchlineWithBasketDto.PROPERTY_SETTING_IDENTIFIER) - .addProperty(String.class, BranchlineWithBasketDto.PROPERTY_BASKET_ID)), + BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketIdDto.class) + .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), TDR(newDefinitionBuilder(TdrDto.class) .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java index d242ddd..a9da1a6 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java @@ -242,9 +242,9 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.BasketDto; -import fr.ird.observe.services.dto.longline.BasketWithSectionDto; +import fr.ird.observe.services.dto.longline.BasketWithSectionIdDto; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.BranchlineWithBasketDto; +import fr.ird.observe.services.dto.longline.BranchlineWithBasketIdDto; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; @@ -525,16 +525,16 @@ class BinderEngineInitializer implements ObserveModelInitializer { public void initBasketDto() { dataDtoToEntityTypeBuilder.put(BasketDto.class, Basket.class); dataBinderBuilder.put(BasketDto.class, new BasketBinder()); - dataDtoToEntityTypeBuilder.put(BasketWithSectionDto.class, Basket.class); - dataBinderBuilder.put(BasketWithSectionDto.class, new BasketBinder()); + dataDtoToEntityTypeBuilder.put(BasketWithSectionIdDto.class, Basket.class); + dataBinderBuilder.put(BasketWithSectionIdDto.class, new BasketBinder()); } @Override public void initBranchlineDto() { dataDtoToEntityTypeBuilder.put(BranchlineDto.class, Branchline.class); dataBinderBuilder.put(BranchlineDto.class, new BranchlineBinder()); - dataDtoToEntityTypeBuilder.put(BranchlineWithBasketDto.class, Branchline.class); - dataBinderBuilder.put(BranchlineWithBasketDto.class, new BranchlineBinder()); + dataDtoToEntityTypeBuilder.put(BranchlineWithBasketIdDto.class, Branchline.class); + dataBinderBuilder.put(BranchlineWithBasketIdDto.class, new BranchlineBinder()); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.