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

Use getCalendarOrDefault to avoid null check

Browse source 
FEA: ItEr61S08TimeUnitConfigurablePlanning
This commit is contained in:
Óscar González Fernández 2010-10-10 23:49:47 +02:00
parent 50a16bc480
commit 698077dd18
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -42,9 +42,7 @@ import java.util.SortedMap;
import java.util.TreeMap;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.calendars.entities.ICalendar;
import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay;
import org.navalplanner.business.common.IAdHocTransactionService;
import org.navalplanner.business.common.IOnTransaction;
import org.navalplanner.business.common.daos.IConfigurationDAO;
@ -856,14 +854,8 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
EffortDuration result = zero();
for (Resource resource : durationsGrouped.get(day).keySet()) {
BaseCalendar calendar = resource.getCalendar();
EffortDuration workableTime = SameWorkHoursEveryDay
.getDefaultWorkingDay().getCapacityOn(day);
if (calendar != null) {
workableTime = calendar.getCapacityOn(day);
}
ICalendar calendar = resource.getCalendarOrDefault();
EffortDuration workableTime = calendar.getCapacityOn(day);
EffortDuration assignedDuration = durationsGrouped.get(day)
.get(resource);
result = result.plus(min(assignedDuration, workableTime));