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

ItEr33S14CUCreacionUnidadesPlanificacion: Using constraints to calculate start instead of calculateStart method

Browse source
This commit is contained in:
Óscar González Fernández 2009-11-07 16:13:32 +01:00
parent 0622d0bb1d
commit 48adfbe914
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,10 +132,11 @@ public class GanttDiagramGraph {
void enforce() {
Set<Dependency> incoming = graph.incomingEdgesOf(task);
Date beginDate = task.getBeginDate();
Date newStart = Dependency
.calculateStart(task, beginDate, incoming);
if (!beginDate.equals(newStart)) {
List<Constraint<Date>> startConstraints = Dependency
.getStartConstraints(incoming);
Date newStart = Constraint.apply(null,
plusGlobalStartConstraints(startConstraints));
if (!task.getBeginDate().equals(newStart)) {
task.setBeginDate(newStart);
}
Date endDate = task.getEndDate();
@ -144,6 +145,15 @@ public class GanttDiagramGraph {
task.setEndDate(newEnd);
}
}
}
private List<Constraint<Date>> plusGlobalStartConstraints(
List<Constraint<Date>> startConstraints) {
List<Constraint<Date>> result = new ArrayList<Constraint<Date>>();
result.addAll(startConstraints);
result.addAll(globalStartConstraints);
return result;
}
public void enforceAllRestrictions() {