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

Inline getTaskCalendar method

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-15 18:41:22 +02:00
parent ad08434ea3
commit 30bcdb2573
1 changed files with 6 additions and 9 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/ResourceAllocation.java
View file

@ -592,9 +592,10 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
private AvailabilityTimeLine getAvailability() {
AvailabilityTimeLine resourcesAvailability = getResourcesAvailability();
if (getTaskCalendar() != null) {
return getTaskCalendar().getAvailability().and(
resourcesAvailability);
BaseCalendar taskCalendar = getTask().getCalendar();
if (taskCalendar != null) {
return taskCalendar.getAvailability()
.and(resourcesAvailability);
} else {
return resourcesAvailability;
}
@ -754,20 +755,16 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
}
private IWorkHours getTaskWorkHours() {
if (getTaskCalendar() == null) {
if (getTask().getCalendar() == null) {
return SameWorkHoursEveryDay.getDefaultWorkingDay();
} else {
return getTaskCalendar();
return getTask().getCalendar();
}
}
protected abstract IWorkHours getWorkHoursGivenTaskHours(
IWorkHours taskWorkHours);
protected final BaseCalendar getTaskCalendar() {
return getTask().getCalendar();
}
private void resetGenericAssignmentsTo(List<DayAssignment> assignments) {
resetAssignmentsTo(cast(assignments));
}