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

ItEr33S08ValidacionEProbasFuncionaisItEr32S09: Using entrySet iterators instead of keySet

Browse source
This commit is contained in:
Óscar González Fernández 2009-11-03 18:05:58 +01:00
parent 3d8820d779
commit 4aba138ec9
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
View file

@ -30,6 +30,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import org.apache.commons.lang.Validate;
import org.joda.time.LocalDate;
@ -240,13 +241,10 @@ public class TaskElementAdapter implements ITaskElementAdapter {
if (daysMap.isEmpty()) {
return null;
}
for (LocalDate day : daysMap.keySet()) {
lastDay = day;
hoursLastDay = daysMap.get(day);
for (Entry<LocalDate, Integer> entry : daysMap.entrySet()) {
lastDay = entry.getKey();
hoursLastDay = entry.getValue();
count += hoursLastDay;
if (count >= hours) {
limitReached = true;
break;

13
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
View file

@ -27,6 +27,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.Map.Entry;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@ -284,21 +285,19 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
protected SortedMap<LocalDate, Integer> groupByWeek(
SortedMap<LocalDate, Integer> map) {
SortedMap<LocalDate, Integer> result = new TreeMap<LocalDate, Integer>();
for (LocalDate day : map.keySet()) {
for (Entry<LocalDate, Integer> entry : map.entrySet()) {
LocalDate day = entry.getKey();
LocalDate key = getThursdayOfThisWeek(day);
Integer hours = entry.getValue() == null ? 0 : entry.getValue();
if (result.get(key) == null) {
result.put(key, map.get(day));
result.put(key, hours);
} else {
result.put(key, result.get(key) + map.get(day));
result.put(key, result.get(key) + hours);
}
}
for (LocalDate day : result.keySet()) {
result.put(day, result.get(day) / 7);
}
return result;
}

9
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
View file

@ -21,9 +21,10 @@
package org.navalplanner.web.resources.search;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.CriterionType;
@ -216,12 +217,12 @@ public class WorkerSearchController extends GenericForwardComposer {
* @return
*/
public TreeModel getCriterions() {
HashMap<CriterionType, Set<Criterion>> criterions = workerSearchModel
Map<CriterionType, Set<Criterion>> criterions = workerSearchModel
.getCriterions();
List<CriterionTreeNode> rootList = new ArrayList<CriterionTreeNode>();
for (CriterionType key : criterions.keySet()) {
rootList.add(asNode(key, criterions.get(key)));
for (Entry<CriterionType, Set<Criterion>> entry : criterions.entrySet()) {
rootList.add(asNode(entry.getKey(), entry.getValue()));
}
CriterionTreeNode root = new CriterionTreeNode("Root", rootList);
return new SimpleTreeModel(root);