From edf8bab805b02e2e33cc95ea40831a642e92057b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 21 Dec 2010 15:30:56 +0100 Subject: [PATCH] [Bug #769] Fix bug Ensuring that the variable with the resulting restrictions is not null. When the task is fixed, this variable was not intialized. FEA: ItEr66S04BugFixing --- .../java/org/zkoss/ganttz/data/GanttDiagramGraph.java | 8 ++++---- 1 file changed, 4 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 27282d2a0..ef59f6d81 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java @@ -1163,19 +1163,19 @@ public class GanttDiagramGraph> implements this.task = taskPoint.task; } - protected PositionRestrictions result; + private PositionRestrictions resultingRestrictions = new NoRestrictions(); protected PositionRestrictions applyConstraintTo( PositionRestrictions restrictions) { if (adapter.isFixed(task)) { return restrictions; } - result = enforceUsingPreviousRestrictions(restrictions); - return result; + resultingRestrictions = enforceUsingPreviousRestrictions(restrictions); + return resultingRestrictions; } public boolean isSatisfiedBy(PositionRestrictions value) { - return result.satisfies(value); + return resultingRestrictions.satisfies(value); } public void checkSatisfiesResult(PositionRestrictions finalResult) {