RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Even if the dates are not changed, new PositionRestrictions must be returned

Browse source 
FEA: ItEr64OTS03PlanificacionHaciaAtras
This commit is contained in:
Óscar González Fernández 2010-12-01 15:34:16 +01:00
parent 73abbcc5e6
commit 1c3403ad20
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java
View file

@ -1219,23 +1219,18 @@ public class GanttDiagramGraph<V, D extends IDependency<V>> implements
return originalRestrictions;
}
GanttDate newStart = calculateStartDate(originalRestrictions);
return enforceRestrictionsForStartIfNeeded(newStart);
}
private PositionRestrictions enforceRestrictionsForStartIfNeeded(
GanttDate newStart) {
GanttDate old = adapter.getStartDate(task);
if (areNotEqual(old, newStart)) {
return moveToStart(newStart);
adapter.setStartDateFor(task, newStart);
}
return originalRestrictions;
}
private PositionRestrictions moveToStart(GanttDate newStart) {
adapter.setStartDateFor(task, newStart);
return biggerThan(newStart, adapter.getEndDateFor(task));
}
private PositionRestrictions moveToEnd(GanttDate newEnd) {
adapter.setEndDateFor(task, newEnd);
return biggerThan(adapter.getStartDate(task), newEnd);
}
/**
* Calculates the new start date based on the present constraints.
* If there are no constraints this method will return the existent
@ -1280,7 +1275,6 @@ public class GanttDiagramGraph<V, D extends IDependency<V>> implements
if (adapter.isFixed(task)) {
return restrictions;
}
GanttDate previousEndDate = adapter.getEndDateFor(task);
GanttDate newEnd = Constraint
.<GanttDate> initialValue(null)
.withConstraints(restrictions.getEndConstraints())
@ -1289,14 +1283,12 @@ public class GanttDiagramGraph<V, D extends IDependency<V>> implements
if (newEnd == null) {
return restrictions;
}
if (areNotEqual(previousEndDate, newEnd)) {
restrictions = moveToEnd(newEnd);
}
restrictions = enforceRestrictionsForEndIfNeeded(newEnd);
if (pointType == PointType.END) {
// start constraints could be the ones "commanding" now
GanttDate newStart = calculateStartDate(restrictions);
if (newStart.compareTo(adapter.getStartDate(task)) > 0) {
return moveToStart(newStart);
return enforceRestrictionsForStartIfNeeded(newStart);
}
}
return restrictions;
@ -1308,6 +1300,15 @@ public class GanttDiagramGraph<V, D extends IDependency<V>> implements
return adapter.getEndConstraintsGivenIncoming(incoming);
}
private PositionRestrictions enforceRestrictionsForEndIfNeeded(
GanttDate newEnd) {
GanttDate previousEndDate = adapter.getEndDateFor(task);
if (areNotEqual(previousEndDate, newEnd)) {
adapter.setEndDateFor(task, newEnd);
}
return biggerThan(adapter.getStartDate(task), newEnd);
}
}
class BackwardsForces extends Forces {
@ -1320,7 +1321,7 @@ public class GanttDiagramGraph<V, D extends IDependency<V>> implements
.withConstraints(getEndConstraints())
.applyWithoutFinalCheck();
if (result != null) {
return moveToEnd(result);
return enforceRestrictions(result);
}
return restrictions;
}
@ -1335,7 +1336,7 @@ public class GanttDiagramGraph<V, D extends IDependency<V>> implements
return adapter.getEndConstraintsFor(task);
}
private PositionRestrictions moveToEnd(GanttDate newEnd) {
private PositionRestrictions enforceRestrictions(GanttDate newEnd) {
adapter.setEndDateFor(task, newEnd);
return lessThan(adapter.getStartDate(task), newEnd);
}