From 8821f6a7a571679c4fa96e2fe39dc841b2a4db47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 7 Dec 2010 13:56:35 +0100 Subject: [PATCH] Pull up fixed task rule FEA: ItEr64OTS03PlanificacionHaciaAtras --- .../java/org/zkoss/ganttz/data/GanttDiagramGraph.java | 9 +++------ 1 file changed, 3 insertions(+), 6 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 732409543..9e798ad61 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java @@ -1146,6 +1146,9 @@ public class GanttDiagramGraph> implements protected PositionRestrictions applyConstraintTo( PositionRestrictions restrictions) { + if (adapter.isFixed(task)) { + return restrictions; + } result = enforceUsingPreviousRestrictions(restrictions); return result; } @@ -1215,9 +1218,6 @@ public class GanttDiagramGraph> implements private PositionRestrictions enforceStartDate( PositionRestrictions originalRestrictions) { - if (adapter.isFixed(task)) { - return originalRestrictions; - } GanttDate newStart = calculateStartDate(originalRestrictions); return enforceRestrictionsForStartIfNeeded(newStart); } @@ -1272,9 +1272,6 @@ public class GanttDiagramGraph> implements private PositionRestrictions enforceEndDate( PositionRestrictions restrictions) { - if (adapter.isFixed(task)) { - return restrictions; - } GanttDate newEnd = Constraint . initialValue(null) .withConstraints(restrictions.getEndConstraints())