From 6e3bc7bea1c29fff6b6a9d2a565b73e328816b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 24 Feb 2011 15:27:56 +0100 Subject: [PATCH] No need to make it abstract It can be implemented directly in UntilFillingHoursAllocator. FEA: ItEr71S07FragmentationDeletionItEr70S09 --- .../business/planner/entities/ResourceAllocation.java | 7 ------- .../UntilFillingHoursAllocator.java | 10 ++++++---- 2 files changed, 6 insertions(+), 11 deletions(-) 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 3fdd8aca6..979f32a64 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 @@ -312,13 +312,6 @@ public abstract class ResourceAllocation extends direction, task, allocations) { - @Override - protected List createAssignmentsAtDay( - ResourcesPerDayModification allocation, PartialDay day, - EffortDuration limit) { - return allocation.createAssignmentsAtDay(day, limit); - } - @Override protected void setNewDataForAllocation( ResourceAllocation allocation, diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java index a0a0bb97f..507a9c1d1 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/UntilFillingHoursAllocator.java @@ -233,10 +233,6 @@ public abstract class UntilFillingHoursAllocator { ResourceAllocation allocation, IntraDayDate resultDate, ResourcesPerDay resourcesPerDay, List dayAssignments); - protected abstract List createAssignmentsAtDay( - ResourcesPerDayModification allocation, PartialDay day, - EffortDuration limit); - protected abstract CapacityResult thereAreAvailableHoursFrom( IntraDayDate dateFromWhichToAllocate, ResourcesPerDayModification resourcesPerDayModification, @@ -262,6 +258,12 @@ public abstract class UntilFillingHoursAllocator { getMaxAssignment(newAssignments)); } + private List createAssignmentsAtDay( + ResourcesPerDayModification allocation, PartialDay day, + EffortDuration limit) { + return allocation.createAssignmentsAtDay(day, limit); + } + private EffortDuration getMaxAssignment(List newAssignments) { if (newAssignments.isEmpty()) { return zero();