From 1ca56bd7f86a3c9bbbd0309ce4eeeec6b3df5382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 15 Dec 2010 01:29:51 +0100 Subject: [PATCH] Fix bug The global constraints to apply depend on the point, globalStartConstraints can't always be applied. FEA: ItEr64OTS03PlanificacionHaciaAtras --- .../org/zkoss/ganttz/data/GanttDiagramGraph.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 d7de5822e..1da1f0116 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java @@ -1388,10 +1388,23 @@ public class GanttDiagramGraph> implements result.addAll(getDependenciesConstraintsFor(getPrimaryPoint())); result.addAll(getTaskConstraints(getPrimaryPoint())); } - result.addAll(globalStartConstraints); + result.addAll(getGlobalConstraintsToApply(getPrimaryPoint())); return result; } + private Collection> getGlobalConstraintsToApply( + Point point) { + Validate.isTrue(isSupportedPoint(point)); + switch (point) { + case START: + return globalStartConstraints; + case END: + return globalEndConstraints; + default: + throw new RuntimeException("shouldn't happen"); + } + } + protected List> getConstraintsForSecondaryPoint() { return getDependenciesConstraintsFor(getSecondaryPoint()); }