From 7feef610856a16bb1355362a0576802dc3fd016d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 15 Sep 2010 12:46:44 +0200 Subject: [PATCH] Remove getDurationAt deprecated method FEA: ItEr60S19TimeUnitDataType --- .../business/calendars/entities/BaseCalendar.java | 9 --------- .../calendars/entities/CombinedWorkHours.java | 5 ----- .../business/calendars/entities/IWorkHours.java | 12 ------------ .../calendars/entities/SameWorkHoursEveryDay.java | 6 ------ .../planner/entities/ResourceAllocation.java | 4 ---- .../calendars/entities/CombinedWorkHoursTest.java | 1 - .../entities/GenericResourceAllocationTest.java | 8 ++------ .../entities/SpecificResourceAllocationTest.java | 12 ------------ 8 files changed, 2 insertions(+), 55 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java index 8b348328c..4c205604e 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java @@ -287,15 +287,6 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours { return null; } - /** - * Returns the number of workable hours for a specific date depending on the - * calendar restrictions. - */ - @Deprecated - public Integer getCapacityAt(LocalDate date) { - return getCapacityDurationAt(date).roundToHours(); - } - public EffortDuration getCapacityDurationAt(LocalDate date) { return getWorkableTimeAt(date); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java index b15731e3b..2cd732a80 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java @@ -69,11 +69,6 @@ public abstract class CombinedWorkHours implements IWorkHours { return new Max(workHours); } - @Override - public Integer getCapacityAt(LocalDate date) { - return getCapacityDurationAt(date).roundToHours(); - } - @Override public EffortDuration getCapacityDurationAt(LocalDate date) { EffortDuration current = null; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java index d6b7ee5ed..3f1045e05 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java @@ -35,18 +35,6 @@ public interface IWorkHours { */ public Integer toHours(LocalDate day, ResourcesPerDay amount); - /** - * Calculates the capacity at a given date. It means all the hours that - * could be worked without having overtime - * - * @param date - * the date at which the capacity is calculated - * @return the capacity at which the resource can work - * - */ - @Deprecated - public Integer getCapacityAt(LocalDate date); - /** * Calculates the capacity duration at a given date. It means all the time * that could be worked without having overtime diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java index fe407eb8b..56b73314a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java @@ -41,12 +41,6 @@ public class SameWorkHoursEveryDay implements IWorkHours { this.hours = hours; } - @Override - @Deprecated - public Integer getCapacityAt(LocalDate date) { - return hours; - } - @Override public EffortDuration getCapacityDurationAt(LocalDate date) { return EffortDuration.hours(hours); 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 378875e69..e4b02f694 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 @@ -759,10 +759,6 @@ public abstract class ResourceAllocation extends private IWorkHours getTaskWorkHours() { return new IWorkHours() { - @Override - public Integer getCapacityAt(LocalDate day) { - return getSubyacent().getCapacityAt(day); - } @Override public EffortDuration getCapacityDurationAt(LocalDate date) { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CombinedWorkHoursTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CombinedWorkHoursTest.java index f0b4a2a67..8f6e8a663 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CombinedWorkHoursTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CombinedWorkHoursTest.java @@ -65,7 +65,6 @@ public class CombinedWorkHoursTest { private IWorkHours hours(int hours) { IWorkHours result = createNiceMock(IWorkHours.class); - expect(result.getCapacityAt(isA(LocalDate.class))).andReturn(hours); expect(result.getCapacityDurationAt(isA(LocalDate.class))).andReturn( EffortDuration.hours(hours)); replay(result); diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java index fb8513e53..9be745563 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java @@ -230,8 +230,6 @@ public class GenericResourceAllocationTest { private T createCalendar(Class klass, final int hoursPerDay) { BaseCalendar baseCalendar = createNiceMock(klass); - expect(baseCalendar.getCapacityAt(isA(LocalDate.class))).andReturn( - hoursPerDay).anyTimes(); expect(baseCalendar.getCapacityDurationAt(isA(LocalDate.class))) .andReturn(hours(hoursPerDay)).anyTimes(); expect(baseCalendar.isActive(isA(LocalDate.class))).andReturn(true) @@ -423,7 +421,7 @@ public class GenericResourceAllocationTest { public void allocatingSeveralResourcesPerDayHavingJustOneResourceProducesOvertime() { LocalDate start = new LocalDate(2006, 10, 5); final Integer standardHoursPerDay = SameWorkHoursEveryDay - .getDefaultWorkingDay().getCapacityAt(start); + .getDefaultWorkingDay().getCapacityDurationAt(start).getHours(); final int TASK_DURATION_DAYS = 4; givenBaseCalendarWithoutExceptions(standardHoursPerDay); givenTaskWithStartAndEnd(toInterval(start, Period @@ -464,7 +462,7 @@ public class GenericResourceAllocationTest { LocalDate start = new LocalDate(2006, 10, 5); final int TASK_DURATION_DAYS = 1; final Integer defaultWorkableHours = SameWorkHoursEveryDay - .getDefaultWorkingDay().getCapacityAt(start); + .getDefaultWorkingDay().getCapacityDurationAt(start).getHours(); givenBaseCalendarWithoutExceptions(defaultWorkableHours); givenTaskWithStartAndEnd(toInterval(start, Period .days(TASK_DURATION_DAYS))); @@ -571,8 +569,6 @@ public class GenericResourceAllocationTest { private ResourceCalendar createCalendar(int capacity, int unit) { ResourceCalendar calendar = createNiceMock(ResourceCalendar.class); - expect(calendar.getCapacityAt(isA(LocalDate.class))).andReturn( - capacity * unit).anyTimes(); expect(calendar.toHours(isA(LocalDate.class), isA(ResourcesPerDay.class))).andReturn(unit).anyTimes(); expect(calendar.isActive(isA(LocalDate.class))).andReturn(true) diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java index cfe8393cb..c9cf50b46 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java @@ -77,8 +77,6 @@ public class SpecificResourceAllocationTest { private void givenResourceCalendarAlwaysReturning(final int hours) { this.calendar = createNiceMock(ResourceCalendar.class); - expect(this.calendar.getCapacityAt(isA(LocalDate.class))).andReturn( - hours).anyTimes(); expect(this.calendar.getCapacityDurationAt(isA(LocalDate.class))) .andReturn(EffortDuration.hours(hours)).anyTimes(); expect(this.calendar.toHours(isA(LocalDate.class), @@ -118,16 +116,6 @@ public class SpecificResourceAllocationTest { return EffortDuration.hours(defaultAnswer); } }).anyTimes(); - expect(this.calendar.getCapacityAt(isA(LocalDate.class))).andAnswer(new IAnswer() { - - @Override - public Integer answer() throws Throwable { - LocalDate date = (LocalDate) EasyMock - .getCurrentArguments()[0]; - return calendar.getCapacityDurationAt(date) - .roundToHours(); - } - }).anyTimes(); expect( this.calendar.toHours(isA(LocalDate.class), isA(ResourcesPerDay.class))).andAnswer(