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

ItEr48S04ValidacionEProbasFuncionaisItEr47S04: [Bug #334] Fixing bug.

Browse source 
The milestones are kept now
This commit is contained in:
Óscar González Fernández 2010-02-17 14:49:18 +01:00
parent 3355e7bab1
commit 8aedddc248
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java
View file

@ -105,6 +105,7 @@ public class TaskGroup extends TaskElement {
}
public void setTaskChildrenTo(List<TaskElement> children) {
Validate.noNullElements(children);
int positionOnTaskElements = 0;
for (int i = 0; i < children.size(); i++) {
TaskElement element = children.get(i);
@ -112,8 +113,7 @@ public class TaskGroup extends TaskElement {
taskElements.add(element);
} else {
while (positionOnTaskElements < taskElements.size()
&& taskElements.get(positionOnTaskElements)
.isMilestone()) {
&& isMilestone(taskElements.get(positionOnTaskElements))) {
positionOnTaskElements++;
}
if (positionOnTaskElements >= taskElements.size()) {
@ -128,12 +128,17 @@ public class TaskGroup extends TaskElement {
.listIterator(positionOnTaskElements);
while (listIterator.hasNext()) {
TaskElement current = listIterator.next();
if (!current.isMilestone()) {
if (!isMilestone(current)) {
listIterator.remove();
}
}
}
private boolean isMilestone(TaskElement t) {
// it can be null since removed elements are nullified in the list
return t != null && t.isMilestone();
}
@Override
protected void initializeEndDate() {
List<Date> endDates = getEndDates(getChildren());