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

ItEr31S12ValidacionEProbasFuncionaisItEr30S17: When detaching a DayAssignment, it's removed from the resource too

Browse source 
bug #66
This commit is contained in:
Óscar González Fernández 2009-10-22 00:12:20 +02:00
parent efb02d7df3
commit a97dec36cd
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java
View file

@ -20,6 +20,7 @@
package org.navalplanner.business.planner.entities;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@ -80,6 +81,7 @@ public class GenericDayAssignment extends DayAssignment {
public void detach() {
genericResourceAllocation = null;
getResource().removeAssignments(Arrays.asList(this));
}
}

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java
View file

@ -20,6 +20,7 @@
package org.navalplanner.business.planner.entities;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@ -81,5 +82,6 @@ public class SpecificDayAssignment extends DayAssignment {
void detach() {
this.specificResourceAllocation = null;
getResource().removeAssignments(Arrays.asList(this));
}
}

7
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
View file

@ -596,6 +596,13 @@ public abstract class Resource extends BaseEntity{
this.dayAssignments.addAll(assignments);
}
public void removeAssignments(
Collection<? extends DayAssignment> assignments) {
Validate.noNullElements(assignments);
clearCachedData();
this.dayAssignments.removeAll(assignments);
}
public List<DayAssignment> getAssignments() {
return new ArrayList<DayAssignment>(dayAssignments);
}