diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java index ef13df8d1..9e21f7a3d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java @@ -225,7 +225,7 @@ public class GenericResourceAllocation extends } } - private class GenericAllocation extends AssignmentsAllocation { + private class GenericAllocation extends AssignmentsAllocator { private EffortDistributor hoursDistributor; private final List resources; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index 3ddfa34e8..228538b3e 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -509,7 +509,7 @@ public abstract class ResourceAllocation extends public abstract IAllocatable withPreviousAssociatedResources(); - protected abstract class AssignmentsAllocation implements IAllocatable { + protected abstract class AssignmentsAllocator implements IAllocatable { @Override public final void allocate(ResourcesPerDay resourcesPerDay) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java index 4db892bff..ac62c4a88 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java @@ -157,33 +157,33 @@ public class SpecificResourceAllocation extends public void allocate(ResourcesPerDay resourcesPerDay) { Validate.notNull(resourcesPerDay); Validate.notNull(resource); - new SpecificAssignmentsAllocation().allocate(resourcesPerDay); + new SpecificAssignmentsAllocator().allocate(resourcesPerDay); } @Override public IAllocateResourcesPerDay resourcesPerDayUntil(LocalDate endExclusive) { - return new SpecificAssignmentsAllocation() + return new SpecificAssignmentsAllocator() .resourcesPerDayUntil(endExclusive); } @Override public IAllocateResourcesPerDay resourcesPerDayFromEndUntil(LocalDate start) { - SpecificAssignmentsAllocation allocator = new SpecificAssignmentsAllocation(); + SpecificAssignmentsAllocator allocator = new SpecificAssignmentsAllocator(); return allocator.resourcesPerDayFromEndUntil(start); } @Override public IAllocateHoursOnInterval fromStartUntil(LocalDate endExclusive) { - return new SpecificAssignmentsAllocation().fromStartUntil(endExclusive); + return new SpecificAssignmentsAllocator().fromStartUntil(endExclusive); } @Override public IAllocateHoursOnInterval fromEndUntil(LocalDate start) { - return new SpecificAssignmentsAllocation().fromEndUntil(start); + return new SpecificAssignmentsAllocator().fromEndUntil(start); } - private final class SpecificAssignmentsAllocation extends - AssignmentsAllocation { + private final class SpecificAssignmentsAllocator extends + AssignmentsAllocator { @Override protected List distributeForDay(LocalDate day, @@ -200,7 +200,7 @@ public class SpecificResourceAllocation extends @Override public IAllocateHoursOnInterval onInterval(LocalDate start, LocalDate end) { - return new SpecificAssignmentsAllocation().onInterval(start, end); + return new SpecificAssignmentsAllocator().onInterval(start, end); } @Override