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

ItEr58S14RecalculosConexionEscenariosItEr57S15: Fix bug.

Browse source 
When a tasks is removed its dependencies must be removed too. Otherwise when the task is not preexistent a TransientObjectException happens.
This commit is contained in:
Óscar González Fernández 2010-05-23 13:34:28 +02:00
parent 90c24974e1
commit 8357c60ca7
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/TaskSource.java
View file

@ -20,6 +20,7 @@
package org.navalplanner.business.orders.entities;
import java.util.ArrayList;
import java.util.ConcurrentModificationException;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -32,6 +33,7 @@ import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.orders.entities.SchedulingState.Type;
import org.navalplanner.business.planner.daos.ITaskElementDAO;
import org.navalplanner.business.planner.daos.ITaskSourceDAO;
import org.navalplanner.business.planner.entities.Dependency;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
@ -223,6 +225,7 @@ public class TaskSource extends BaseEntity {
public TaskElement apply(ITaskSourceDAO taskSourceDAO,
boolean preexistent) {
if (!preexistent) {
removeDependenciesFor(taskSource.getTask());
return null;
}
try {
@ -240,6 +243,30 @@ public class TaskSource extends BaseEntity {
return null;
}
private void removeDependenciesFor(TaskElement task) {
for (Dependency each : copy(task
.getDependenciesWithThisDestination())) {
removeDependency(each);
}
for (Dependency each : copy(task.getDependenciesWithThisOrigin())) {
removeDependency(each);
}
}
private void removeDependency(Dependency each) {
each.getOrigin().removeDependencyWithDestination(
each.getDestination(),
each.getType());
}
/**
* Copy the dependencies to a list in order to avoid
* {@link ConcurrentModificationException}
*/
private List<Dependency> copy(Set<Dependency> dependencies) {
return new ArrayList<Dependency>(dependencies);
}
}
public static TaskSource withHoursGroupOf(