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

ItEr37S08CUCreacionUnidadesPlanificacionItEr36S11: Using factory method instead of constructor to create an AllocationResult

Browse source
This commit is contained in:
Óscar González Fernández 2009-12-01 22:49:09 +01:00
parent ed7283b53f
commit 190f8bc6cb
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationResult.java
View file

@ -36,7 +36,7 @@ import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.Task.ModifiedAllocation;
import org.navalplanner.business.planner.entities.allocationalgorithms.ResourcesPerDayModification;
import org.navalplanner.business.planner.entities.allocationalgorithms.AllocationModification;
/**
* @author Óscar González Fernández <ogonzalez@igalia.com>
@ -45,9 +45,9 @@ import org.navalplanner.business.planner.entities.allocationalgorithms.Resources
public class AllocationResult {
private static Map<ResourceAllocation<?>, ResourceAllocation<?>> translation(
Map<ResourcesPerDayModification, ResourceAllocation<?>> fromDetachedToAttached) {
Map<? extends AllocationModification, ResourceAllocation<?>> fromDetachedToAttached) {
Map<ResourceAllocation<?>, ResourceAllocation<?>> result = new HashMap<ResourceAllocation<?>, ResourceAllocation<?>>();
for (Entry<ResourcesPerDayModification, ResourceAllocation<?>> entry : fromDetachedToAttached
for (Entry<? extends AllocationModification, ResourceAllocation<?>> entry : fromDetachedToAttached
.entrySet()) {
result
.put(entry.getKey().getBeingModified(), entry
@ -81,6 +81,16 @@ public class AllocationResult {
return result;
}
public static AllocationResult create(
Task task,
CalculatedValue calculatedValue,
AggregateOfResourceAllocations aggregate,
Map<? extends AllocationModification, ResourceAllocation<?>> fromDetachedAllocationToAttached) {
Map<ResourceAllocation<?>, ResourceAllocation<?>> translation = translation(fromDetachedAllocationToAttached);
return new AllocationResult(task, calculatedValue, aggregate,
calculateNew(translation), calculateModified(translation));
}
private final AggregateOfResourceAllocations aggregate;
private final Integer daysDuration;
@ -93,11 +103,12 @@ public class AllocationResult {
private final List<Task.ModifiedAllocation> modified;
AllocationResult(
private AllocationResult(
Task task,
CalculatedValue calculatedValue,
AggregateOfResourceAllocations aggregate,
Map<ResourcesPerDayModification, ResourceAllocation<?>> fromDetachedAllocationToAttached) {
List<ResourceAllocation<?>> newAllocations,
List<Task.ModifiedAllocation> modified) {
Validate.notNull(aggregate);
Validate.notNull(calculatedValue);
Validate.notNull(task);
@ -106,9 +117,8 @@ public class AllocationResult {
this.aggregate = aggregate;
this.daysDuration = aggregate.isEmpty() ? task.getDaysDuration()
: aggregate.getDaysDuration();
Map<ResourceAllocation<?>, ResourceAllocation<?>> fromDetachedToAttached = translation(fromDetachedAllocationToAttached);
this.newAllocations = calculateNew(fromDetachedToAttached);
this.modified = calculateModified(fromDetachedToAttached);
this.newAllocations = newAllocations;
this.modified = modified;
}
public AggregateOfResourceAllocations getAggregate() {

9
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java
View file

@ -50,8 +50,7 @@ public class ResourceAllocationsBeingEdited {
AggregateOfResourceAllocations aggregate = new AggregateOfResourceAllocations(
AllocationModification.getBeingModified(forModification
.keySet()));
return new AllocationResult(task, task.getCalculatedValue(), aggregate,
forModification);
return AllocationResult.create(task, task.getCalculatedValue(), aggregate, forModification);
}
private static Map<ResourcesPerDayModification, ResourceAllocation<?>> forModification(
@ -205,10 +204,8 @@ public class ResourceAllocationsBeingEdited {
throw new RuntimeException("cant handle: " + calculatedValue);
}
}
AllocationResult result = new AllocationResult(task, calculatedValue,
new AggregateOfResourceAllocations(AllocationModification
.getBeingModified(allocations)),
fromDetachedToAttached);
AllocationResult result = AllocationResult.create(task, calculatedValue, new AggregateOfResourceAllocations(AllocationModification
.getBeingModified(allocations)), fromDetachedToAttached);
daysDuration = result.getDaysDuration();
return result;
}