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 700f0b85f..8b348328c 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,14 +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. - */ - public Integer getWorkableHours(Date date) { - return getWorkableTimeAt(new LocalDate(date)).roundToHours(); - } - /** * Returns the number of workable hours for a specific date depending on the * calendar restrictions. 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 f79431585..7e3da254e 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 @@ -219,8 +219,6 @@ public class GenericResourceAllocationTest { private T createCalendar(Class klass, final int hoursPerDay) { BaseCalendar baseCalendar = createNiceMock(klass); - expect(baseCalendar.getWorkableHours(isA(Date.class))).andReturn( - hoursPerDay).anyTimes(); expect(baseCalendar.getCapacityAt(isA(LocalDate.class))).andReturn( hoursPerDay).anyTimes(); expect(baseCalendar.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 3609ae292..cfe8393cb 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 @@ -37,7 +37,6 @@ import static org.navalplanner.business.test.planner.entities.DayAssignmentMatch import static org.navalplanner.business.test.planner.entities.DayAssignmentMatchers.haveHours; import static org.navalplanner.business.test.planner.entities.DayAssignmentMatchers.haveResourceAllocation; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -82,8 +81,6 @@ public class SpecificResourceAllocationTest { hours).anyTimes(); expect(this.calendar.getCapacityDurationAt(isA(LocalDate.class))) .andReturn(EffortDuration.hours(hours)).anyTimes(); - expect(this.calendar.getWorkableHours(isA(Date.class))) - .andReturn(hours).anyTimes(); expect(this.calendar.toHours(isA(LocalDate.class), isA(ResourcesPerDay.class))).andAnswer( toHoursAnswer(hours)).anyTimes();