RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr39S16CUConfiguracionMaquinasItEr35S09: Extracting method for getting assignemnts on an interval

Browse source
This commit is contained in:
Óscar González Fernández 2009-12-17 20:08:22 +01:00
parent 311be9b945
commit 44a21ea814
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
View file

@ -39,6 +39,21 @@ import org.navalplanner.business.resources.entities.Resource;
public abstract class DayAssignment extends BaseEntity {
public static <T extends DayAssignment> List<T> getAtInterval(
List<T> orderedAssignments, LocalDate startInclusive,
LocalDate endExclusive) {
List<T> result = new ArrayList<T>();
for (T dayAssignment : orderedAssignments) {
if (dayAssignment.getDay().compareTo(endExclusive) >= 0) {
break;
}
if (dayAssignment.includedIn(startInclusive, endExclusive)) {
result.add(dayAssignment);
}
}
return result;
}
public static int sum(Collection<? extends DayAssignment> assignments) {
int result = 0;
for (DayAssignment dayAssignment : assignments) {

13
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -577,19 +577,10 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
public List<DayAssignment> getAssignments(LocalDate start,
LocalDate endExclusive) {
List<DayAssignment> result = new ArrayList<DayAssignment>();
for (DayAssignment dayAssignment : getAssignments()) {
if (dayAssignment.getDay().compareTo(endExclusive) >= 0) {
break;
}
if (dayAssignment.includedIn(start, endExclusive)) {
result.add(dayAssignment);
}
}
return result;
return new ArrayList<DayAssignment>(DayAssignment.getAtInterval(
getAssignments(), start, endExclusive));
}
public int getAssignedHours(LocalDate start, LocalDate endExclusive) {
return getAssignedHours(getAssignments(start, endExclusive));
}