From 65a2993adc256f74c48c82af83545dbda44f59d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 4 Nov 2009 13:32:21 +0100
Subject: [PATCH] ItEr33S08ValidacionEProbasFuncionaisItEr32S09: Some forgotten
 fixes

---
 ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java    | 2 +-
 .../org/zkoss/ganttz/resourceload/ResourceLoadComponent.java | 2 +-
 .../business/resources/entities/CriterionSatisfaction.java   | 3 ++-
 .../navalplanner/web/planner/loadchart/LoadChartFiller.java  | 5 +++--
 .../web/resources/worker/CriterionSatisfactionDTO.java       | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
index cabce85c6..8a2b8d8ec 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
@@ -110,7 +110,7 @@ public class TaskComponent extends Div implements AfterCompose {
 
             String[] requestData = request.getData();
 
-            if ((requestData != null) && (requestData.length != 1)) {
+            if (requestData == null || requestData.length != 1) {
                 throw new UiException(MZk.ILLEGAL_REQUEST_WRONG_DATA,
                         new Object[] { Objects.toString(requestData), this });
             } else {
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
index 5d677d791..bb49b27a8 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
@@ -47,7 +47,7 @@ public class ResourceLoadComponent extends XulElement {
 
     private final LoadTimeLine loadLine;
     private final TimeTracker timeTracker;
-    private IZoomLevelChangedListener zoomChangedListener;
+    private transient IZoomLevelChangedListener zoomChangedListener;
 
     private ResourceLoadComponent(final TimeTracker timeTracker,
             final LoadTimeLine loadLine) {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java
index b630a45b6..b3a50634f 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java
@@ -163,7 +163,8 @@ public class CriterionSatisfaction extends BaseEntity {
     }
 
     public void finish(Date finish) {
-        Validate.isTrue(finish == null || getStartDate() == null
+        Validate.notNull(finish);
+        Validate.isTrue(getStartDate() == null
                 || getStartDate().equals(finish) || getStartDate().before(finish));
         Validate.isTrue(finishDate == null || isNewObject() ||
                 getEndDate().equals(finish) || getEndDate().before(finish));
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
index 144734e73..4a64e6932 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
@@ -295,8 +295,9 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
                 result.put(key, result.get(key) + hours);
             }
         }
-        for (LocalDate day : result.keySet()) {
-            result.put(day, result.get(day) / 7);
+        for (Entry<LocalDate, Integer> entry : result.entrySet()) {
+            LocalDate day = entry.getKey();
+            result.put(entry.getKey(), result.get(day) / 7);
         }
         return result;
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java
index 2a83caacc..df8543f03 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java
@@ -99,11 +99,11 @@ public class CriterionSatisfactionDTO implements INewObject {
     }
 
     public Date getStartDate() {
-        return new Date(startDate.getTime());
+        return startDate != null ? new Date(startDate.getTime()) : null;
     }
 
     public Date getEndDate() {
-        return new Date(endDate.getTime());
+        return endDate != null ? new Date(endDate.getTime()) : null;
     }
 
     public CriterionSatisfaction getCriterionSatisfaction() {