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

Use guard instead of if for all method

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-05-13 19:32:45 +02:00
parent e5c2dadf16
commit 15facfeb08
1 changed files with 78 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

163
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java
View file

@ -195,48 +195,45 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
}
private void addConsolidatedValue(ConsolidatedValue value) {
if (consolidation != null && task != null) {
if (consolidation.getConsolidatedValues().contains(value)) {
return;
}
if (!consolidation.isCalculated()) {
((NonCalculatedConsolidation) consolidation)
.addConsolidatedValue((NonCalculatedConsolidatedValue) value);
} else {
((CalculatedConsolidation) consolidation)
.addConsolidatedValue((CalculatedConsolidatedValue) value);
}
if (consolidation == null || task == null
|| consolidation.getConsolidatedValues().contains(value)) {
return;
}
if (!consolidation.isCalculated()) {
((NonCalculatedConsolidation) consolidation)
.addConsolidatedValue((NonCalculatedConsolidatedValue) value);
} else {
((CalculatedConsolidation) consolidation)
.addConsolidatedValue((CalculatedConsolidatedValue) value);
}
task.updateAssignmentsConsolidatedValues();
task.updateAssignmentsConsolidatedValues();
Set<ResourceAllocation<?>> allResourceAllocations = task
.getAllResourceAllocations();
for (ResourceAllocation<?> resourceAllocation : allResourceAllocations) {
LocalDate endExclusive = LocalDate.fromDateFields(task
.getEndDate());
Set<ResourceAllocation<?>> allResourceAllocations = task
.getAllResourceAllocations();
for (ResourceAllocation<?> resourceAllocation : allResourceAllocations) {
LocalDate endExclusive = LocalDate
.fromDateFields(task.getEndDate());
EffortDuration pendingEffort = consolidation
.getNotConsolidated(resourceAllocation
.getIntendedTotalAssigment());
EffortDuration pendingEffort = consolidation
.getNotConsolidated(resourceAllocation
.getIntendedTotalAssigment());
resourceAllocation
.setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());
resourceAllocation
.setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());
if (value.getDate().compareTo(endExclusive.minusDays(1)) >= 0) {
if (!AllocationsSpecified.isZero(resourceAllocation
.asResourcesPerDayModification().getGoal()
.getAmount())) {
IntraDayDate date = ResourceAllocation.allocating(
Arrays.asList(resourceAllocation
.asResourcesPerDayModification()))
.untilAllocating(pendingEffort);
task.setIntraDayEndDate(date.nextDayAtStart());
}
} else {
reassign(resourceAllocation, task
.getFirstDayNotConsolidated().getDate(),
endExclusive, pendingEffort);
if (value.getDate().compareTo(endExclusive.minusDays(1)) >= 0) {
if (!AllocationsSpecified.isZero(resourceAllocation
.asResourcesPerDayModification().getGoal().getAmount())) {
IntraDayDate date = ResourceAllocation.allocating(
Arrays.asList(resourceAllocation
.asResourcesPerDayModification()))
.untilAllocating(pendingEffort);
task.setIntraDayEndDate(date.nextDayAtStart());
}
} else {
reassign(resourceAllocation, task.getFirstDayNotConsolidated()
.getDate(), endExclusive, pendingEffort);
}
}
}
@ -279,59 +276,55 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
}
private void deleteConsolidationIfIsNeeded(AdvanceConsolidationDTO dto) {
if (dto.getConsolidatedValue() != null) {
if (consolidation != null && task != null) {
LocalDate taskEndDate = LocalDate.fromDateFields(task
.getEndDate());
LocalDate endExclusive = taskEndDate;
if (!consolidation.getConsolidatedValues().isEmpty()) {
endExclusive = consolidation.getConsolidatedValues().last()
.getTaskEndDate();
}
if (dto.getConsolidatedValue() == null || consolidation == null
|| task == null) {
return;
}
if (!consolidation.isCalculated()) {
((NonCalculatedConsolidation) consolidation)
.getNonCalculatedConsolidatedValues().remove(
dto.getConsolidatedValue());
dto.getAdvanceMeasurement()
.getNonCalculatedConsolidatedValues().remove(
dto.getConsolidatedValue());
LocalDate taskEndDate = LocalDate.fromDateFields(task.getEndDate());
LocalDate endExclusive = taskEndDate;
if (!consolidation.getConsolidatedValues().isEmpty()) {
endExclusive = consolidation.getConsolidatedValues().last()
.getTaskEndDate();
}
if (!consolidation.isCalculated()) {
((NonCalculatedConsolidation) consolidation)
.getNonCalculatedConsolidatedValues().remove(
dto.getConsolidatedValue());
dto.getAdvanceMeasurement().getNonCalculatedConsolidatedValues()
.remove(dto.getConsolidatedValue());
} else {
((CalculatedConsolidation) consolidation)
.getCalculatedConsolidatedValues().remove(
dto.getConsolidatedValue());
}
task.updateAssignmentsConsolidatedValues();
LocalDate firstDayNotConsolidated = task.getFirstDayNotConsolidated()
.getDate();
Set<ResourceAllocation<?>> allResourceAllocations = task
.getAllResourceAllocations();
for (ResourceAllocation<?> resourceAllocation : allResourceAllocations) {
resourceAllocation
.setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());
EffortDuration pendingEffort = task.getConsolidation()
.getNotConsolidated(
resourceAllocation.getIntendedTotalAssigment());
if (!taskEndDate.equals(endExclusive)) {
if ((taskEndDate != null) && (endExclusive != null)
&& (taskEndDate.compareTo(endExclusive) <= 0)) {
reassign(resourceAllocation, taskEndDate, endExclusive,
EffortDuration.zero());
} else {
((CalculatedConsolidation) consolidation)
.getCalculatedConsolidatedValues().remove(
dto.getConsolidatedValue());
}
task.updateAssignmentsConsolidatedValues();
LocalDate firstDayNotConsolidated = task
.getFirstDayNotConsolidated().getDate();
Set<ResourceAllocation<?>> allResourceAllocations = task
.getAllResourceAllocations();
for (ResourceAllocation<?> resourceAllocation : allResourceAllocations) {
resourceAllocation
.setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());
EffortDuration pendingEffort = task.getConsolidation()
.getNotConsolidated(
resourceAllocation
.getIntendedTotalAssigment());
if (!taskEndDate.equals(endExclusive)) {
if ((taskEndDate != null) && (endExclusive != null)
&& (taskEndDate.compareTo(endExclusive) <= 0)) {
reassign(resourceAllocation, taskEndDate,
endExclusive, EffortDuration.zero());
} else {
reassign(resourceAllocation, endExclusive,
taskEndDate, EffortDuration.zero());
}
task.setEndDate(endExclusive.toDateTimeAtStartOfDay()
.toDate());
}
reassign(resourceAllocation, firstDayNotConsolidated,
endExclusive, pendingEffort);
reassign(resourceAllocation, endExclusive, taskEndDate,
EffortDuration.zero());
}
task.setEndDate(endExclusive.toDateTimeAtStartOfDay().toDate());
}
reassign(resourceAllocation, firstDayNotConsolidated, endExclusive,
pendingEffort);
}
}