diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java index 598b76aa4..fecfdb775 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java @@ -1133,14 +1133,13 @@ public class PlanningStateCreator { } } - public static class RelatedWithAnyOf implements + public static class RelatedWith implements IAllocationCriteria { - private final Collection anyOf; + private final Criterion criterion; - public RelatedWithAnyOf( - Collection anyOf) { - this.anyOf = anyOf; + public RelatedWith(Criterion criterion) { + this.criterion = criterion; } @Override @@ -1156,7 +1155,7 @@ public class PlanningStateCreator { private boolean someCriterionIn( Collection allocationCriterions) { for (Criterion each : allocationCriterions) { - if (this.anyOf.contains(each)) { + if (criterion.equals(each)) { return true; } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java index 1a94198ef..2370623d3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java @@ -26,7 +26,6 @@ import static org.libreplan.web.I18nHelper._; import static org.libreplan.web.planner.order.PlanningStateCreator.and; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -74,7 +73,7 @@ import org.libreplan.business.users.entities.UserRole; import org.libreplan.web.calendars.BaseCalendarModel; import org.libreplan.web.planner.order.PlanningStateCreator.IAllocationCriteria; import org.libreplan.web.planner.order.PlanningStateCreator.PlanningState; -import org.libreplan.web.planner.order.PlanningStateCreator.RelatedWithAnyOf; +import org.libreplan.web.planner.order.PlanningStateCreator.RelatedWith; import org.libreplan.web.planner.order.PlanningStateCreator.RelatedWithResource; import org.libreplan.web.planner.order.PlanningStateCreator.SpecificRelatedWithCriterionOnInterval; import org.libreplan.web.planner.order.PlanningStateCreator.TaskOnInterval; @@ -506,7 +505,7 @@ public class ResourceLoadModel implements IResourceLoadModel { for (Entry> each : map .entrySet()) { IAllocationCriteria criteria = and(onInterval(), - new RelatedWithAnyOf(Arrays.asList(each.getKey()))); + new RelatedWith(each.getKey())); List> replaced = parameters .getPlanningState().replaceByCurrentOnes( each.getValue(), criteria);