From 4e697d5c5d1163decfadf168d80f69173a2ed34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 15 Sep 2010 16:40:35 +0200 Subject: [PATCH] Convert withHours method to withDuration method FEA: ItEr60S19TimeUnitDataType --- .../business/planner/entities/DayAssignment.java | 2 +- .../business/planner/entities/DerivedDayAssignment.java | 2 +- .../business/planner/entities/GenericDayAssignment.java | 5 +++-- .../business/planner/entities/SpecificDayAssignment.java | 5 +++-- .../limiting/entities/LimitingResourceAllocator.java | 6 +++--- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java index ef3513824..f147a1dac 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java @@ -258,6 +258,6 @@ public abstract class DayAssignment extends BaseEntity { */ public abstract Scenario getScenario(); - public abstract DayAssignment withHours(int newHours); + public abstract DayAssignment withDuration(EffortDuration newDuration); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedDayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedDayAssignment.java index 27b9a32b5..da50d12aa 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedDayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedDayAssignment.java @@ -175,7 +175,7 @@ public class DerivedDayAssignment extends DayAssignment { } @Override - public DayAssignment withHours(int newHours) { + public DayAssignment withDuration(EffortDuration newDuration) { throw new UnsupportedOperationException(); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java index 9eded3247..f5ac28478 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java @@ -218,8 +218,9 @@ public class GenericDayAssignment extends DayAssignment { return parentState.getScenario(); } - public DayAssignment withHours(int newHours) { - GenericDayAssignment result = create(getDay(), newHours, getResource()); + public DayAssignment withDuration(EffortDuration newDuration) { + GenericDayAssignment result = create(getDay(), newDuration, + getResource()); if (container != null) { result.parentState.setParent(container); } else if (this.getGenericResourceAllocation() != null) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java index c8159921f..f3904ddfd 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java @@ -205,8 +205,9 @@ public class SpecificDayAssignment extends DayAssignment { } @Override - public DayAssignment withHours(int newHours) { - SpecificDayAssignment result = create(getDay(), newHours, getResource()); + public DayAssignment withDuration(EffortDuration newDuration) { + SpecificDayAssignment result = create(getDay(), newDuration, + getResource()); if (container != null) { result.parentState.setParent(container); } else if (this.getSpecificResourceAllocation() != null) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java index 8d6267b84..af4db138b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java @@ -20,12 +20,13 @@ package org.navalplanner.business.planner.limiting.entities; +import static org.navalplanner.business.workingday.EffortDuration.hours; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; -import java.util.Set; import org.joda.time.LocalDate; import org.navalplanner.business.calendars.entities.ResourceCalendar; @@ -35,7 +36,6 @@ import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; import org.navalplanner.business.planner.entities.SpecificDayAssignment; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; -import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.LimitingResourceQueue; import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.workingday.ResourcesPerDay; @@ -301,7 +301,7 @@ public class LimitingResourceAllocator { if (hoursTaken == current.getHours()) { listIterator.remove(); } else { - listIterator.set(current.withHours(hoursTaken)); + listIterator.set(current.withDuration(hours(hoursTaken))); } } }