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

Simplify method

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-02 17:53:42 +02:00
parent b7ac478eda
commit 6f7ef1a310
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
View file

@ -406,25 +406,17 @@ public abstract class ChartFiller implements IChartFiller {
SortedMap<LocalDate, Map<Resource, Integer>> map = new TreeMap<LocalDate, Map<Resource, Integer>>();
for (DayAssignment dayAssignment : dayAssignments) {
LocalDate day = dayAssignment.getDay();
final LocalDate day = dayAssignment.getDay();
final int dayAssignmentHours = dayAssignment.getHours();
Resource resource = dayAssignment.getResource();
if (map.get(day) == null) {
HashMap<Resource, Integer> resourcesMap = new HashMap<Resource, Integer>();
resourcesMap.put(dayAssignment.getResource(), dayAssignment
.getHours());
map.put(day, resourcesMap);
} else {
if (map.get(day).get(dayAssignment.getResource()) == null) {
map.get(day).put(dayAssignment.getResource(),
dayAssignment.getHours());
} else {
Integer hours = map.get(day).get(
dayAssignment.getResource());
hours += dayAssignment.getHours();
map.get(day).put(dayAssignment.getResource(), hours);
}
map.put(day, new HashMap<Resource, Integer>());
}
Map<Resource, Integer> forDay = map.get(day);
Integer previousHours = forDay.get(resource);
previousHours = previousHours != null ? previousHours : 0;
forDay.put(dayAssignment.getResource(), previousHours + dayAssignmentHours);
}
return map;
}