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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Fix bug.

Browse source 
Take into account the initially modified. As it already has the new
value and if there are no other modifications, necessary parent
shrinkages could not be done.
This commit is contained in:
Óscar González Fernández 2010-07-08 20:41:57 +02:00
parent 1458162d26
commit af1aa94a31
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -691,18 +691,20 @@ public class GanttDiagramGraph<V, D> {
for (V each : tasks) {
allRecalculations.addAll(getRecalculationsNeededFrom(each));
}
enforceRestrictionsOn(allRecalculations);
enforceRestrictionsOn(allRecalculations, tasks);
}
void enforceRestrictionsOn(V task) {
enforceRestrictionsOn(getRecalculationsNeededFrom(task));
enforceRestrictionsOn(getRecalculationsNeededFrom(task),
Collections.singleton(task));
}
void enforceRestrictionsOn(final List<Recalculation> recalculations) {
void enforceRestrictionsOn(final List<Recalculation> recalculations,
final Collection<? extends V> initiallyModified) {
executeWithPreAndPostActionsOnlyIfNewEntrance(new IAction() {
@Override
public void doAction() {
doRecalculations(recalculations);
doRecalculations(recalculations, initiallyModified);
}
});
}
@ -777,13 +779,16 @@ public class GanttDiagramGraph<V, D> {
@Override
public void doAction() {
List<Recalculation> recalculationsNeededFrom = getRecalculationsNeededFrom(task);
doRecalculations(recalculationsNeededFrom);
doRecalculations(recalculationsNeededFrom,
Collections.singletonList(task));
}
});
}
private void doRecalculations(List<Recalculation> recalculationsNeeded) {
private void doRecalculations(List<Recalculation> recalculationsNeeded,
Collection<? extends V> initiallyModified) {
Set<V> allModified = new HashSet<V>();
allModified.addAll(initiallyModified);
for (Recalculation each : recalculationsNeeded) {
boolean modified = each.doRecalculation();
if (modified) {
@ -792,7 +797,8 @@ public class GanttDiagramGraph<V, D> {
}
List<V> shrunkContainers = shrunkContainersOfModified(allModified);
for (V each : getTaskAffectedByShrinking(shrunkContainers)) {
doRecalculations(getRecalculationsNeededFrom(each));
doRecalculations(getRecalculationsNeededFrom(each),
Collections.singletonList(each));
}
}