From 29ed1006a8298c4fe588ca161e0ae660a412d703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 18 Jan 2011 20:57:38 +0100 Subject: [PATCH] Replace switch by method FEA: ItEr68OTS05IntroducionLimiteSobreasignacionCalendarios --- .../calendars/entities/BaseCalendar.java | 30 +++---------------- 1 file changed, 4 insertions(+), 26 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 cd7eeef47..fb8377f0e 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 @@ -33,7 +33,6 @@ import org.hibernate.validator.AssertTrue; import org.hibernate.validator.NotEmpty; import org.hibernate.validator.NotNull; import org.hibernate.validator.Valid; -import org.joda.time.DateTimeConstants; import org.joda.time.LocalDate; import org.navalplanner.business.calendars.daos.IBaseCalendarDAO; import org.navalplanner.business.calendars.entities.CalendarData.Days; @@ -273,32 +272,11 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { if (exceptionDay != null) { return exceptionDay.getDuration(); } + return getDurationAt(date, getDayFrom(date)); + } - switch (date.getDayOfWeek()) { - case DateTimeConstants.MONDAY: - return getDurationAt(date, Days.MONDAY); - - case DateTimeConstants.TUESDAY: - return getDurationAt(date, Days.TUESDAY); - - case DateTimeConstants.WEDNESDAY: - return getDurationAt(date, Days.WEDNESDAY); - - case DateTimeConstants.THURSDAY: - return getDurationAt(date, Days.THURSDAY); - - case DateTimeConstants.FRIDAY: - return getDurationAt(date, Days.FRIDAY); - - case DateTimeConstants.SATURDAY: - return getDurationAt(date, Days.SATURDAY); - - case DateTimeConstants.SUNDAY: - return getDurationAt(date, Days.SUNDAY); - - default: - throw new RuntimeException("Day of week out of range!"); - } + private Days getDayFrom(LocalDate date) { + return Days.values()[date.getDayOfWeek() - 1]; } private boolean isOverAssignable(LocalDate localDate) {