From 32a71e85eeff8c1c8f3263b2d681217154a53032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 12 Nov 2012 17:38:49 +0100 Subject: [PATCH] Remove other allocation methods with LocalDate parameters FEA: ItEr77S04BugFixing --- .../planner/entities/IAllocatable.java | 21 ------------------- .../planner/entities/ResourceAllocation.java | 13 ------------ .../entities/SpecificResourceAllocation.java | 10 --------- 3 files changed, 44 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/IAllocatable.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/IAllocatable.java index 4f8186047..50bf293a6 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/IAllocatable.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/IAllocatable.java @@ -78,16 +78,6 @@ public interface IAllocatable extends IAllocateResourcesPerDay { public IAllocateEffortOnInterval onInterval(IntraDayDate start, IntraDayDate end); - /** - * It allocates the effort specified on the interval from the start, i.e. - * first day not consolidated to the specified end. All previous assignments - * are removed, but the consolidated ones. - * - * @param endExclusive - * @return - */ - public IAllocateEffortOnInterval fromStartUntil(LocalDate endExclusive); - /** * It allocates the effort specified on the interval from the start, i.e. * first day not consolidated to the specified end. All previous assignments @@ -98,17 +88,6 @@ public interface IAllocatable extends IAllocateResourcesPerDay { */ public IAllocateEffortOnInterval fromStartUntil(IntraDayDate end); - /** - * It allocates the effort specified on the interval from the end until the - * start. Being the start the maximum of the provided start and the first - * not consolidated day. All previous assignments are removed, but the - * consolidated ones. - * - * @param endExclusive - * @return - */ - public IAllocateEffortOnInterval fromEndUntil(LocalDate start); - /** * It allocates the effort specified on the interval from the end until the * start. Being the start the maximum of the provided start and the first diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java index 2748d2632..a4bfb7db3 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java @@ -895,13 +895,6 @@ public abstract class ResourceAllocation extends interval.resetAssignments(assignments); } - @Override - public IAllocateEffortOnInterval fromStartUntil(final LocalDate end) { - final AllocationInterval interval = new AllocationInterval( - getStartSpecifiedByTask(), IntraDayDate.startOfDay(end)); - return getIAllocateEffortOnInterval(interval); - } - @Override public IAllocateEffortOnInterval fromStartUntil(final IntraDayDate end) { final AllocationInterval interval = new AllocationInterval( @@ -936,12 +929,6 @@ public abstract class ResourceAllocation extends }; } - @Override - public IAllocateEffortOnInterval fromEndUntil(final LocalDate start) { - return fromEndUntil(IntraDayDate.startOfDay(start)); - - } - @Override public IAllocateEffortOnInterval fromEndUntil(IntraDayDate start) { final AllocationInterval interval = new AllocationInterval(start, diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificResourceAllocation.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificResourceAllocation.java index d0f100e8a..494307a17 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificResourceAllocation.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SpecificResourceAllocation.java @@ -178,21 +178,11 @@ public class SpecificResourceAllocation extends return allocator.resourcesPerDayFromEndUntil(start); } - @Override - public IAllocateEffortOnInterval fromStartUntil(LocalDate endExclusive) { - return new SpecificAssignmentsAllocator().fromStartUntil(endExclusive); - } - @Override public IAllocateEffortOnInterval fromStartUntil(IntraDayDate end) { return new SpecificAssignmentsAllocator().fromStartUntil(end); } - @Override - public IAllocateEffortOnInterval fromEndUntil(LocalDate start) { - return new SpecificAssignmentsAllocator().fromEndUntil(start); - } - @Override public IAllocateEffortOnInterval fromEndUntil(IntraDayDate start) { return new SpecificAssignmentsAllocator().fromEndUntil(start);