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 541900b93ca45109f3db5e13208f696edcb72b91 Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 10 10:42:21 2017 +0100 Lors de la suppression d'un programme, l'UI propose des programmes qui ne sont pas du type de la marée (Fixes #8935) --- .../swing/ui/content/ref/ContentReferenceUIHandler.java | 14 +++++++++++--- .../observe/services/dto/referential/ProgramHelper.java | 8 ++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java index 79d5f9c..6c65fbe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java @@ -43,19 +43,20 @@ import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ProgramHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.referential.ReferentialService; -import org.nuiton.jaxx.runtime.swing.CardLayout2Ext; -import org.nuiton.jaxx.widgets.select.BeanListHeader; -import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.runtime.swing.CardLayout2Ext; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.widgets.select.BeanListHeader; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -680,6 +681,10 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte .filter(r -> !bean.getId().equals(r.getId())) .collect(Collectors.toList()); + if (ProgramDto.class.equals(getBeanType())) { + referenceList = (List)ProgramHelper.filterGearType((List) referenceList, ((ProgramDto) getBean()).getGearType()); + } + Pair<Boolean, ReferentialReference<E>> result = showUsagesForDesactivated(bean, usages, referenceList); boolean willsave = result.getLeft(); @@ -748,6 +753,9 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte .filter(r -> !bean.getId().equals(r.getId())) .collect(Collectors.toList()); + if (ProgramDto.class.equals(getBeanType())) { + referenceList = (List)ProgramHelper.filterGearType((List) referenceList, ((ProgramDto) getBean()).getGearType()); + } if (log.isDebugEnabled()) { log.debug("found some usages, ask user to select a replacement"); } diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java index d32bd09..95b4bea 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.stream.Collectors; public class ProgramHelper extends GeneratedProgramHelper { @@ -72,4 +73,11 @@ public class ProgramHelper extends GeneratedProgramHelper { return new ArrayList<>(map.values()); } + public static List<ReferentialReference<ProgramDto>> filterGearType(List<ReferentialReference<ProgramDto>> programs, GearType gearType) { + + return programs.stream() + .filter(r -> gearType.equals(r.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE))) + .collect(Collectors.toList()); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.