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

ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Refactor.

Browse source 
Only the allocation is needed so the parameter list reduced to one
parameter. Also renamed to reflect better meaning.
This commit is contained in:
Óscar González Fernández 2010-06-27 19:48:50 +02:00
parent d3fcbde23c
commit 0cf1f3ebff
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
View file

@ -408,7 +408,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
AllocationAttempt allocation = requirements
.guessValidity(eachSubGap);
if (allocation.isValid()) {
doAllocation(requirements, allocation, eachSubGap.getOriginQueue());
applyAllocation(allocation);
return allocation;
}
}
@ -424,21 +424,21 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
return Collections.singletonList(each);
}
private void doAllocation(InsertionRequirements requirements,
AllocationAttempt allocation, LimitingResourceQueue queue) {
private void applyAllocation(AllocationAttempt allocationStillNotDone) {
LimitingResourceQueueElement element = allocationStillNotDone
.getElement();
LimitingResourceQueue queue = allocationStillNotDone.getQueue();
Resource resource = queue.getResource();
ResourceAllocation<?> resourceAllocation = requirements
.getElement().getResourceAllocation();
List<DayAssignment> assignments = allocation
ResourceAllocation<?> resourceAllocation = element.getResourceAllocation();
List<DayAssignment> assignments = allocationStillNotDone
.getAssignmentsFor(resourceAllocation, resource);
resourceAllocation
.allocateLimitingDayAssignments(assignments);
updateStartAndEndTimes(requirements.getElement(),
allocation.getStartInclusive(), allocation
updateStartAndEndTimes(element, allocationStillNotDone
.getStartInclusive(), allocationStillNotDone
.getEndExclusive());
addLimitingResourceQueueElement(queue, requirements
.getElement());
markAsModified(requirements.getElement());
addLimitingResourceQueueElement(queue, element);
markAsModified(element);
}
private DateAndHour getEndsAfterBecauseOfGantt(