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 25b381c9649005d425c86bfe39a14dfacbc9abf8 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 16:32:49 2016 +0200 Refactorise les entités BasketWithSection et BranchlineWithBasket et corrige les erreurs de compilation refs #7493 --- .../ui/content/table/impl/longline/LonglinePositionHelper.java | 10 ++++++---- .../observe/services/dto/longline/BasketWithSectionDto.java | 4 ++-- .../observe/services/dto/longline/BranchlineWithBasketDto.java | 4 ++-- .../services/dto/reference/DataReferenceSetDefinitions.java | 4 ++-- 4 files changed, 12 insertions(+), 10 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 3f8ffc8..c28e66b 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,7 +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.BranchlineDto; +import fr.ird.observe.services.dto.longline.BranchlineWithBasketDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.LonglinePositionAwareDto; import fr.ird.observe.services.dto.longline.LonglinePositionSetDto; @@ -265,7 +267,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { protected DataReference<SectionDto> getSection(DataReference<BasketDto> basket) { - String sectionId = (String) basket.getPropertyValue(BasketDto.PROPERTY_SECTION); + String sectionId = (String) basket.getPropertyValue(BasketWithSectionDto.PROPERTY_SECTION_ID); DataReference<SectionDto> section = sectionUniverse.stream() // TODO sbavencoff 11/03/2016 utiliser le prédicat AbstractReference.newIdPredicate() @@ -280,7 +282,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { protected DataReference<BasketDto> getBasket(DataReference<BranchlineDto> branchline) { - String basketId = (String) branchline.getPropertyValue(BranchlineDto.PROPERTY_BASKET); + String basketId = (String) branchline.getPropertyValue(BranchlineWithBasketDto.PROPERTY_BASKET_ID); DataReference<BasketDto> basket = basketUniverse.stream() // TODO sbavencoff 11/03/2016 utiliser le prédicat DataReference.newLabelValuePredicate @@ -298,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(BasketDto.PROPERTY_SECTION))) + .filter(b -> section.getId().equals(b.getPropertyValue(BasketWithSectionDto.PROPERTY_SECTION_ID))) .collect(Collectors.toList()); return baskets; @@ -309,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(BranchlineDto.PROPERTY_BASKET))) + .filter(b -> basket.getId().equals(b.getPropertyValue(BranchlineWithBasketDto.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/BasketWithSectionDto.java index 3a046ef..615d1dc 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/BasketWithSectionDto.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.dto.longline; * #L% */ -public class BasketWithSectionDto extends AbstractBasketDto { +public class BasketWithSectionDto extends BasketDto { private static final long serialVersionUID = 3690753995685507632L; - public static final String PROPERTY_SECTION = "section"; + public static final String PROPERTY_SECTION_ID = "sectionId"; } \ No newline at end of file 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/BranchlineWithBasketDto.java index 0adec6a..b7b2856 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/BranchlineWithBasketDto.java @@ -22,10 +22,10 @@ package fr.ird.observe.services.dto.longline; * #L% */ -public class BranchlineWithBasketDto extends AbstractBranchlineDto { +public class BranchlineWithBasketDto extends BranchlineDto { private static final long serialVersionUID = 7018072108318352694L; - public static final String PROPERTY_BASKET = "basket"; + public static final String PROPERTY_BASKET_ID = "basket"; } 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 eb77e05..634a886 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 @@ -153,12 +153,12 @@ public enum DataReferenceSetDefinitions { 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)), + .addProperty(String.class, BasketWithSectionDto.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)), + .addProperty(String.class, BranchlineWithBasketDto.PROPERTY_BASKET_ID)), TDR(newDefinitionBuilder(TdrDto.class) .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.