This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3d5939ba4f0279b75bb112639f1586c064e229b5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 14:08:00 2016 +0100 [ObServeLL] Classement des listes déroulantes section/panier/avançon du formulaire capture (Fixes #7326) --- .../table/impl/longline/LonglinePositionHelper.java | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java index 7310ebc..a5bb1a6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java @@ -78,10 +78,15 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { PropertyChangeListener basketChanged = evt -> onBasketChanged((DataReference<BasketDto>) evt.getNewValue(), (D) evt.getSource()); tableEditBean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_BASKET, basketChanged); + // tri par virage + uiSection.getIndexes().setSelectedButton(1); + // tri par virage + uiBasket.getIndexes().setSelectedButton(1); + // tri par virage + uiBranchline.getIndexes().setSelectedButton(1); } - public void initSections(LonglinePositionSetDto positionSetDto, - Collection<D> dtos) { + public void initSections(LonglinePositionSetDto positionSetDto, Collection<D> dtos) { this.sectionUniverse = positionSetDto.getSections(); this.basketUniverse = positionSetDto.getBaskets(); @@ -270,11 +275,9 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { String sectionId = (String) basket.getPropertyValue(BasketWithSectionIdDto.PROPERTY_SECTION_ID); return sectionUniverse.stream() - // TODO sbavencoff 11/03/2016 utiliser le prédicat AbstractReference.newIdPredicate() - // A la migartion vers les prédicats JAVA8 .filter(s -> sectionId.equals(s.getId())) .findFirst() - .get(); + .orElse(null); } @@ -283,19 +286,15 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { String basketId = (String) branchline.getPropertyValue(BranchlineWithBasketIdDto.PROPERTY_BASKET_ID); return basketUniverse.stream() - // TODO sbavencoff 11/03/2016 utiliser le prédicat DataReference.newLabelValuePredicate - // A la migartion vers les prédicats JAVA8 .filter(b -> basketId.equals(b.getId())) .findFirst() - .get(); + .orElse(null); } protected List<DataReference<BasketDto>> getBaskets(DataReference<SectionDto> section) { return 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(BasketWithSectionIdDto.PROPERTY_SECTION_ID))) .collect(Collectors.toList()); } @@ -303,8 +302,6 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { protected List<DataReference<BranchlineDto>> getBranchlines(DataReference<BasketDto> basket) { return 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(BranchlineWithBasketIdDto.PROPERTY_BASKET_ID))) .collect(Collectors.toList()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.