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

Remove unnecessary indirection

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-15 18:38:08 +02:00
parent 892c159330
commit ad08434ea3
1 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,6 @@ import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.calendars.entities.CombinedWorkHours;
import org.navalplanner.business.calendars.entities.IWorkHours;
import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay;
import org.navalplanner.business.calendars.entities.ThereAreHoursOnWorkHoursCalculator;
import org.navalplanner.business.common.BaseEntity;
import org.navalplanner.business.common.Registry;
import org.navalplanner.business.planner.entities.DerivedAllocationGenerator.IWorkerFinder;
@ -755,39 +754,11 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
}
private IWorkHours getTaskWorkHours() {
return new IWorkHours() {
@Override
public EffortDuration getCapacityDurationAt(LocalDate date) {
return getSubyacent().getCapacityDurationAt(date);
}
private IWorkHours getSubyacent() {
if (getTaskCalendar() == null) {
return SameWorkHoursEveryDay.getDefaultWorkingDay();
} else {
return getTaskCalendar();
}
}
@Override
public EffortDuration asDurationOn(LocalDate day,
ResourcesPerDay amount) {
return getSubyacent().asDurationOn(day, amount);
}
@Override
public boolean thereAreCapacityFor(AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, EffortDuration durationToAllocate) {
return ThereAreHoursOnWorkHoursCalculator.thereIsAvailableCapacityFor(this,
availability, resourcesPerDay, durationToAllocate);
}
@Override
public AvailabilityTimeLine getAvailability() {
return getSubyacent().getAvailability();
}
};
if (getTaskCalendar() == null) {
return SameWorkHoursEveryDay.getDefaultWorkingDay();
} else {
return getTaskCalendar();
}
}
protected abstract IWorkHours getWorkHoursGivenTaskHours(