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 726aaf335..0cf07e21c 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java @@ -153,10 +153,13 @@ public class GanttDiagramGraph { } private void enforceStartDate(Set incoming) { - List> startConstraints = Dependency + List> dependencyConstraints = Dependency .getStartConstraints(incoming); - Date newStart = Constraint.apply(null, - plusGlobalStartConstraints(startConstraints)); + Date newStart = Constraint. initialValue(null) + .withConstraints(dependencyConstraints) + .withConstraints(task.getStartConstraints()) + .withConstraints(globalStartConstraints) + .apply(); if (!task.getBeginDate().equals(newStart)) { task.setBeginDate(newStart); } @@ -164,14 +167,6 @@ public class GanttDiagramGraph { } - private List> plusGlobalStartConstraints( - List> startConstraints) { - List> result = new ArrayList>(); - result.addAll(startConstraints); - result.addAll(globalStartConstraints); - return result; - } - public void enforceAllRestrictions() { for (DependencyRulesEnforcer rulesEnforcer : rulesEnforcersByTask .values()) {