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 5c7c27033..775e33502 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java @@ -1058,13 +1058,13 @@ public class GanttDiagramGraph> implements } DatesBasedPositionRestrictions biggerThan(GanttDate start, GanttDate end) { - ComparisonType type = scheduleBackwards ? ComparisonType.BIGGER_OR_EQUAL_THAN_LEFT_FLOATING - : ComparisonType.BIGGER_OR_EQUAL_THAN; + ComparisonType type = isScheduleForward() ? ComparisonType.BIGGER_OR_EQUAL_THAN + : ComparisonType.BIGGER_OR_EQUAL_THAN_LEFT_FLOATING; return new DatesBasedPositionRestrictions(type, start, end); } DatesBasedPositionRestrictions lessThan(GanttDate start, GanttDate end) { - ComparisonType type = scheduleBackwards ? ComparisonType.LESS_OR_EQUAL_THAN_RIGHT_FLOATING + ComparisonType type = isScheduleForward() ? ComparisonType.LESS_OR_EQUAL_THAN_RIGHT_FLOATING : ComparisonType.LESS_OR_EQUAL_THAN; return new DatesBasedPositionRestrictions(type, start, end); } @@ -1703,6 +1703,14 @@ public class GanttDiagramGraph> implements return result; } + public boolean isScheduleForward() { + return !isScheduleBackwards(); + } + + public boolean isScheduleBackwards() { + return scheduleBackwards; + } + @Override public GanttDate getEndDateFor(V task) { return adapter.getEndDateFor(task);