From 48adfbe914be65af9dc14917066131f0d9d6ff69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sat, 7 Nov 2009 16:13:32 +0100
Subject: [PATCH] ItEr33S14CUCreacionUnidadesPlanificacion: Using constraints
 to calculate start instead of calculateStart method

---
 .../zkoss/ganttz/data/GanttDiagramGraph.java   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java
index 402630afb..a785834a7 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java
@@ -132,10 +132,11 @@ public class GanttDiagramGraph {
 
         void enforce() {
             Set<Dependency> incoming = graph.incomingEdgesOf(task);
-            Date beginDate = task.getBeginDate();
-            Date newStart = Dependency
-                    .calculateStart(task, beginDate, incoming);
-            if (!beginDate.equals(newStart)) {
+            List<Constraint<Date>> startConstraints = Dependency
+                    .getStartConstraints(incoming);
+            Date newStart = Constraint.apply(null,
+                    plusGlobalStartConstraints(startConstraints));
+            if (!task.getBeginDate().equals(newStart)) {
                 task.setBeginDate(newStart);
             }
             Date endDate = task.getEndDate();
@@ -144,6 +145,15 @@ public class GanttDiagramGraph {
                 task.setEndDate(newEnd);
             }
         }
+
+    }
+
+    private List<Constraint<Date>> plusGlobalStartConstraints(
+            List<Constraint<Date>> startConstraints) {
+        List<Constraint<Date>> result = new ArrayList<Constraint<Date>>();
+        result.addAll(startConstraints);
+        result.addAll(globalStartConstraints);
+        return result;
     }
 
     public void enforceAllRestrictions() {