From 772f2d103f8a8611b40f434913cdab52cef002f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 20 Sep 2010 20:11:42 +0200 Subject: [PATCH] Disable choosing of resources when picking generic machines FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04 --- .../search/NewAllocationSelectorController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java index 361f46514..1e82d153d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java @@ -23,11 +23,12 @@ package org.navalplanner.web.resources.search; import static org.navalplanner.web.I18nHelper._; import java.util.ArrayList; +import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import org.apache.commons.lang.StringUtils; import org.navalplanner.business.resources.entities.Criterion; @@ -155,9 +156,17 @@ public class NewAllocationSelectorController extends onType(currentAllocationType); } + private void onType(AllocationType type) { - listBoxResources.setDisabled(AllocationType.GENERIC_WORKERS == type); currentAllocationType = type; + listBoxResources.setDisabled(isGenericType()); + } + + private static final EnumSet genericTypes = EnumSet.of( + AllocationType.GENERIC_MACHINES, AllocationType.GENERIC_WORKERS); + + private boolean isGenericType() { + return genericTypes.contains(currentAllocationType); } @SuppressWarnings("unchecked")