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

No need to make it abstract

Browse source 
It can be implemented directly in UntilFillingHoursAllocator.

FEA: ItEr71S07FragmentationDeletionItEr70S09
This commit is contained in:
Óscar González Fernández 2011-02-24 15:27:56 +01:00
parent 7a00bd09e5
commit 6e3bc7bea1
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -312,13 +312,6 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
direction,
task, allocations) {
@Override
protected List<DayAssignment> createAssignmentsAtDay(
ResourcesPerDayModification allocation, PartialDay day,
EffortDuration limit) {
return allocation.createAssignmentsAtDay(day, limit);
}
@Override
protected <T extends DayAssignment> void setNewDataForAllocation(
ResourceAllocation<T> allocation,

10
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java
View file

@ -233,10 +233,6 @@ public abstract class UntilFillingHoursAllocator {
ResourceAllocation<T> allocation, IntraDayDate resultDate,
ResourcesPerDay resourcesPerDay, List<T> dayAssignments);
protected abstract List<DayAssignment> createAssignmentsAtDay(
ResourcesPerDayModification allocation, PartialDay day,
EffortDuration limit);
protected abstract CapacityResult thereAreAvailableHoursFrom(
IntraDayDate dateFromWhichToAllocate,
ResourcesPerDayModification resourcesPerDayModification,
@ -262,6 +258,12 @@ public abstract class UntilFillingHoursAllocator {
getMaxAssignment(newAssignments));
}
private List<DayAssignment> createAssignmentsAtDay(
ResourcesPerDayModification allocation, PartialDay day,
EffortDuration limit) {
return allocation.createAssignmentsAtDay(day, limit);
}
private EffortDuration getMaxAssignment(List<DayAssignment> newAssignments) {
if (newAssignments.isEmpty()) {
return zero();