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

Revert "Bug #1320: Fix issue changing methods to get constraints for a task"

Browse source 
This reverts commit 8a98bf4666 because of the
solution for bug #1320 was causing a new bug #1540.
This commit is contained in:
Manuel Rego Casasnovas 2012-10-09 09:29:41 +02:00
parent 4757dc30c0
commit 04bdd1937b
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
View file

@ -120,7 +120,6 @@ public class TaskElementAdapter {
public static List<Constraint<GanttDate>> getStartConstraintsFor( public static List<Constraint<GanttDate>> getStartConstraintsFor(
TaskElement taskElement, LocalDate orderInitDate) { TaskElement taskElement, LocalDate orderInitDate) {
List<Constraint<GanttDate>> constraints = new ArrayList<Constraint<GanttDate>>();
if (taskElement instanceof ITaskPositionConstrained) { if (taskElement instanceof ITaskPositionConstrained) {
ITaskPositionConstrained task = (ITaskPositionConstrained) taskElement; ITaskPositionConstrained task = (ITaskPositionConstrained) taskElement;
TaskPositionConstraint startConstraint = task TaskPositionConstraint startConstraint = task
@ -130,31 +129,25 @@ public class TaskElementAdapter {
switch (constraintType) { switch (constraintType) {
case AS_SOON_AS_POSSIBLE: case AS_SOON_AS_POSSIBLE:
if (orderInitDate != null) { if (orderInitDate != null) {
constraints.add(biggerOrEqualThan(toGantt(orderInitDate))); return Collections
.singletonList(biggerOrEqualThan(toGantt(orderInitDate)));
} }
break; return Collections.emptyList();
case START_IN_FIXED_DATE: case START_IN_FIXED_DATE:
constraints.add(equalTo(toGantt(startConstraint return Collections
.getConstraintDate()))); .singletonList(equalTo(toGantt(startConstraint
break; .getConstraintDate())));
case START_NOT_EARLIER_THAN: case START_NOT_EARLIER_THAN:
constraints.add(biggerOrEqualThan(toGantt(startConstraint return Collections
.getConstraintDate()))); .singletonList(biggerOrEqualThan(toGantt(startConstraint
break; .getConstraintDate())));
} }
} }
if (!taskElement.isRoot() && taskElement instanceof TaskGroup) { return Collections.emptyList();
for (TaskElement child : ((TaskGroup) taskElement).getChildren()) {
constraints
.addAll(getStartConstraintsFor(child, orderInitDate));
}
}
return constraints;
} }
public static List<Constraint<GanttDate>> getEndConstraintsFor( public static List<Constraint<GanttDate>> getEndConstraintsFor(
TaskElement taskElement, LocalDate deadline) { TaskElement taskElement, LocalDate deadline) {
List<Constraint<GanttDate>> constraints = new ArrayList<Constraint<GanttDate>>();
if (taskElement instanceof ITaskPositionConstrained) { if (taskElement instanceof ITaskPositionConstrained) {
ITaskPositionConstrained task = (ITaskPositionConstrained) taskElement; ITaskPositionConstrained task = (ITaskPositionConstrained) taskElement;
TaskPositionConstraint endConstraint = task.getPositionConstraint(); TaskPositionConstraint endConstraint = task.getPositionConstraint();
@ -162,21 +155,15 @@ public class TaskElementAdapter {
switch (type) { switch (type) {
case AS_LATE_AS_POSSIBLE: case AS_LATE_AS_POSSIBLE:
if (deadline != null) { if (deadline != null) {
constraints.add(lessOrEqualThan(toGantt(deadline))); return Collections
.singletonList(lessOrEqualThan(toGantt(deadline)));
} }
break;
case FINISH_NOT_LATER_THAN: case FINISH_NOT_LATER_THAN:
GanttDate date = toGantt(endConstraint.getConstraintDate()); GanttDate date = toGantt(endConstraint.getConstraintDate());
constraints.add(lessOrEqualThan(date)); return Collections.singletonList(lessOrEqualThan(date));
break;
} }
} }
if (!taskElement.isRoot() && taskElement instanceof TaskGroup) { return Collections.emptyList();
for (TaskElement child : ((TaskGroup) taskElement).getChildren()) {
constraints.addAll(getEndConstraintsFor(child, deadline));
}
}
return constraints;
} }
public static GanttDate toGantt(IntraDayDate date) { public static GanttDate toGantt(IntraDayDate date) {