This is an automated email from the git hooks/post-receive script. New commit to branch feature/7621 in repository observe. See http://git.codelutin.com/observe.git commit 6ebc9b945be162a92888f6d6556f21472a8d80e3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:56:51 2015 +0100 extraction de la méthode de filtrage dans le dtos --- .../ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java | 8 ++------ .../java/fr/ird/observe/services/dto/referential/ProgramDtos.java | 5 +++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java index 3712097..c4eb58c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -23,15 +23,14 @@ package fr.ird.observe.ui.tree; */ import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ProgramDtos; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.tree.actions.ChangeTripProgramActionListener; import org.apache.commons.logging.Log; @@ -255,10 +254,7 @@ public class ObserveNavigationTreeShowPopupAction { LinkedHashSet<ReferenceDto> allPrograms = applicationContext.newService(ReferentialService.class) .getReferentialReferenceSet(ProgramDto.class) .getReference(); - List<ReferenceDto> programs = - Lists.newArrayList(Iterables.filter(allPrograms, - ReferenceDtos.newLabelValuePredicate(ProgramDto.PROPERTY_GEAR_TYPE, - gearType))); + List<ReferenceDto> programs = Lists.newArrayList(ProgramDtos.filterReferencesByGearType(allPrograms, gearType)); String openProgramId = applicationContext.getDataContext().getOpenProgramId(); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java index eb0b619..03c2e3c 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.dto.referential; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceDtos; @@ -62,4 +63,8 @@ public class ProgramDtos extends AbstractProgramDtos { return reference; } + public static Iterable<ReferenceDto> filterReferencesByGearType(Iterable<ReferenceDto> programs, GearType gearType) { + return Iterables.filter(programs, ReferenceDtos.newLabelValuePredicate(ProgramDto.PROPERTY_GEAR_TYPE, gearType)); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.