diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java index 2c21976d9..e2469e6b7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java @@ -671,13 +671,17 @@ public abstract class AllocationRow { } private void loadResourcesPerDayFrom(ResourceAllocation allocation) { + setResourcesPerDayEditedValue(extractEditedValueFrom(allocation)); + } + + private ResourcesPerDay extractEditedValueFrom( + ResourceAllocation allocation) { if (allocation == null) { - setResourcesPerDayEditedValue(ResourcesPerDay.amount(0)); + return ResourcesPerDay.amount(0); } boolean useIntention = currentCalculatedValue != CalculatedValue.RESOURCES_PER_DAY; - setResourcesPerDayEditedValue(useIntention ? allocation - .getIntendedResourcesPerDay() : allocation - .getNonConsolidatedResourcePerDay()); + return useIntention ? allocation.getIntendedResourcesPerDay() + : allocation.getNonConsolidatedResourcePerDay(); } public abstract ResourceEnum getType();