From bb1af58fb135a7b09bb9131c44a0093e5ccfe1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 18 Jan 2011 17:21:35 +0100 Subject: [PATCH] Remove use of java.util.Date for Calendar related entities FEA: ItEr68OTS05IntroducionLimiteSobreasignacionCalendarios --- .../calendars/entities/BaseCalendar.java | 127 +----------------- .../calendars/entities/CalendarData.java | 5 - .../calendars/entities/CalendarException.java | 8 -- .../entities/CalendarExceptionTest.java | 4 +- .../calendars/BaseCalendarCRUDController.java | 13 +- .../BaseCalendarEditionController.java | 60 ++++++--- .../web/calendars/BaseCalendarModel.java | 29 ++-- .../web/calendars/IBaseCalendarModel.java | 12 +- .../machine/MachineCRUDController.java | 2 +- .../worker/WorkerCRUDController.java | 2 +- .../web/calendars/BaseCalendarModelTest.java | 11 +- 11 files changed, 71 insertions(+), 202 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 a7d5a9b1e..1b0177aff 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 @@ -24,7 +24,6 @@ import static org.navalplanner.business.workingday.EffortDuration.zero; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -143,10 +142,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return getLastCalendarData().getParent(); } - public BaseCalendar getParent(Date date) { - return getParent(new LocalDate(date)); - } - public BaseCalendar getParent(LocalDate date) { return getCalendarData(date).getParent(); } @@ -155,10 +150,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { getLastCalendarData().setParent(parent); } - public void setParent(BaseCalendar parent, Date date) { - setParent(parent, new LocalDate(date)); - } - public void setParent(BaseCalendar parent, LocalDate date) { getCalendarData(date).setParent(parent); } @@ -167,10 +158,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return (getParent() != null); } - public boolean isDerived(Date date) { - return isDerived(new LocalDate(date)); - } - public boolean isDerived(LocalDate date) { return (getParent(date) != null); } @@ -194,10 +181,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return Collections.unmodifiableSet(exceptionDays); } - public Set getExceptions(Date date) { - return getExceptions(new LocalDate(date)); - } - public Set getExceptions(LocalDate date) { Set exceptionDays = new HashSet(); exceptionDays.addAll(exceptions); @@ -240,10 +223,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { exceptions.add(day); } - public void removeExceptionDay(Date date) throws IllegalArgumentException { - removeExceptionDay(new LocalDate(date)); - } - public void removeExceptionDay(LocalDate date) throws IllegalArgumentException { CalendarException day = getOwnExceptionDay(date); @@ -255,11 +234,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { exceptions.remove(day); } - public void updateExceptionDay(Date date, Capacity capacity, - CalendarExceptionType type) throws IllegalArgumentException { - updateExceptionDay(new LocalDate(date), capacity, type); - } - public void updateExceptionDay(LocalDate date, Capacity capacity, CalendarExceptionType type) throws IllegalArgumentException { removeExceptionDay(date); @@ -267,10 +241,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { addExceptionDay(day); } - public CalendarException getOwnExceptionDay(Date date) { - return getOwnExceptionDay(new LocalDate(date)); - } - public CalendarException getOwnExceptionDay(LocalDate date) { for (CalendarException exceptionDay : exceptions) { if (exceptionDay.getDate().equals(date)) { @@ -281,10 +251,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return null; } - public CalendarException getExceptionDay(Date date) { - return getExceptionDay(new LocalDate(date)); - } - public CalendarException getExceptionDay(LocalDate date) { for (CalendarException exceptionDay : getExceptions(date)) { if (exceptionDay.getDate().equals(date)) { @@ -343,10 +309,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return true; } - public EffortDuration getDurationAt(Date date, Days day) { - return getDurationAt(new LocalDate(date), day); - } - public EffortDuration getDurationAt(LocalDate date, Days day) { CalendarData calendarData = getCalendarData(date); @@ -366,14 +328,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return duration; } - /** - * Returns the number of workable hours for a specific period depending on - * the calendar restrictions. - */ - public Integer getWorkableHours(Date initDate, Date endDate) { - return getWorkableHours(new LocalDate(initDate), new LocalDate(endDate)); - } - /** * Returns the number of workable hours for a specific period depending on * the calendar restrictions. @@ -396,14 +350,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return result; } - /** - * Returns the number of workable hours for a specific week depending on the - * calendar restrictions. - */ - public Integer getWorkableHoursPerWeek(Date date) { - return getWorkableHoursPerWeek(new LocalDate(date)); - } - /** * Returns the number of workable hours for a specific week depending on the * calendar restrictions. @@ -432,15 +378,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return derivedCalendar; } - /** - * Creates a new version this {@link BaseCalendar} from the specific date. - * It makes that the current calendar expires in the specific date. And the - * new calendar will be used from that date onwards. - */ - public void newVersion(Date date) throws IllegalArgumentException { - newVersion(new LocalDate(date)); - } - /** * Creates a new version this {@link BaseCalendar} from the specific date. * It makes that the current calendar expires in the specific date. And the @@ -474,8 +411,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { } } - if (version.getExpiringDate().toDateTimeAtStartOfDay().toDate() - .compareTo(new Date()) <= 0) { + if (version.getExpiringDate().compareTo(new LocalDate()) <= 0) { throw new IllegalArgumentException( "You can not add a version with previous date than current date"); @@ -522,10 +458,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return copy; } - public DayType getType(Date date) { - return getType(new LocalDate(date)); - } - public DayType getType(LocalDate date) { CalendarException exceptionDay = getExceptionDay(date); if (exceptionDay != null) { @@ -570,10 +502,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { calendarData.setDurationAt(day, duration); } - public void setDurationAt(Days day, EffortDuration effort, Date date) { - setDurationAt(day, effort, LocalDate.fromDateFields(date)); - } - public void setDurationAt(Days day, EffortDuration effort, LocalDate date) { CalendarData calendarData = getCalendarData(date); calendarData.setDurationAt(day, effort); @@ -591,10 +519,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return calendarData.isDefault(day); } - public boolean isDefault(Days day, Date date) { - return isDefault(day, new LocalDate(date)); - } - public boolean isDefault(Days day, LocalDate date) { CalendarData calendarData = getCalendarData(date); return calendarData.isDefault(day); @@ -605,10 +529,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { calendarData.setDefault(day); } - public void setDefault(Days day, Date date) { - setDefault(day, new LocalDate(date)); - } - public void setDefault(Days day, LocalDate date) { CalendarData calendarData = getCalendarData(date); calendarData.setDefault(day); @@ -618,27 +538,14 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return getLastCalendarData().getExpiringDate(); } - public LocalDate getExpiringDate(Date date) { - return getExpiringDate(new LocalDate(date)); - } - public LocalDate getExpiringDate(LocalDate date) { return getCalendarData(date).getExpiringDate(); } - public void setExpiringDate(Date expiringDate) { - setExpiringDate(new LocalDate(expiringDate)); - } - public void setExpiringDate(LocalDate expiringDate) { setExpiringDate(expiringDate, new LocalDate()); } - public void setExpiringDate(Date expiringDate, Date date) - throws IllegalArgumentException { - setExpiringDate(new LocalDate(expiringDate), new LocalDate(date)); - } - public void setExpiringDate(LocalDate expiringDate, LocalDate date) throws IllegalArgumentException { CalendarData calendarData = getCalendarData(date); @@ -674,10 +581,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return calendarDataVersions.get(index); } - public LocalDate getValidFrom(Date date) { - return getValidFrom(new LocalDate(date)); - } - public LocalDate getValidFrom(LocalDate date) { CalendarData calendarData = getPreviousCalendarData(date); if (calendarData == null) { @@ -686,10 +589,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return calendarData.getExpiringDate(); } - public void setValidFrom(Date validFromDate, Date date) { - setValidFrom(new LocalDate(validFromDate), new LocalDate(date)); - } - public void setValidFrom(LocalDate validFromDate, LocalDate date) throws IllegalArgumentException { CalendarData calendarData = getPreviousCalendarData(date); @@ -700,14 +599,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { setExpiringDate(calendarData, validFromDate); } - public boolean isLastVersion(Date date) { - return isLastVersion(new LocalDate(date)); - } - - public boolean isFirstVersion(Date date) { - return isFirstVersion(new LocalDate(date)); - } - public boolean isLastVersion(LocalDate date) { CalendarData calendarData = getCalendarData(date); Integer index = calendarDataVersions.indexOf(calendarData); @@ -720,15 +611,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return (index == 0); } - /** - * Returns a set of non workable days (0 hours) for a specific period - * depending on the calendar restrictions. - */ - public Set getNonWorkableDays(Date initDate, Date endDate) { - return getNonWorkableDays(new LocalDate(initDate), new LocalDate( - endDate)); - } - /** * Returns a set of non workable days (0 hours) for a specific period * depending on the calendar restrictions. @@ -744,9 +626,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { return result; } - public CalendarExceptionType getExceptionType(Date date) { - return getExceptionType(new LocalDate(date)); - } public CalendarExceptionType getExceptionType(LocalDate date) { CalendarException exceptionDay = getExceptionDay(date); @@ -832,10 +711,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { calendarAvailabilities.remove(calendarAvailability); } - public boolean isActive(Date date) { - return isActive(new LocalDate(date)); - } - public boolean isActive(LocalDate date) { if (getCalendarAvailabilities().isEmpty()) { return true; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java index b04a76b37..7bc665968 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java @@ -20,7 +20,6 @@ package org.navalplanner.business.calendars.entities; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -142,10 +141,6 @@ public class CalendarData extends IntegrationEntity { return expiringDate; } - public void setExpiringDate(Date expiringDate) { - setExpiringDate(new LocalDate(expiringDate)); - } - public void setExpiringDate(LocalDate expiringDate) { this.expiringDate = expiringDate; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarException.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarException.java index adfb0a656..f48b16b15 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarException.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarException.java @@ -20,8 +20,6 @@ package org.navalplanner.business.calendars.entities; -import java.util.Date; - import org.apache.commons.lang.Validate; import org.hibernate.validator.NotNull; import org.joda.time.LocalDate; @@ -40,12 +38,6 @@ import org.navalplanner.business.workingday.EffortDuration; */ public class CalendarException extends IntegrationEntity { - public static CalendarException create(Date date, EffortDuration duration, - CalendarExceptionType type) { - return create(new CalendarException(new LocalDate(date), from(duration, - type), type)); - } - public static CalendarException create(LocalDate date, EffortDuration duration, CalendarExceptionType type) { return create(new CalendarException(date, from(duration, type), type)); diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CalendarExceptionTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CalendarExceptionTest.java index e402cf388..03b431747 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CalendarExceptionTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CalendarExceptionTest.java @@ -23,8 +23,6 @@ package org.navalplanner.business.test.calendars.entities; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; -import java.util.Date; - import org.joda.time.LocalDate; import org.junit.Test; import org.navalplanner.business.calendars.entities.CalendarException; @@ -40,7 +38,7 @@ public class CalendarExceptionTest { @Test public void testCreateExceptionDayWithDate() { - Date date = new Date(); + LocalDate date = new LocalDate(); CalendarExceptionType type = BaseCalendarTest .createCalendarExceptionType(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java index 90a1f7c27..0fa38323c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java @@ -22,8 +22,7 @@ package org.navalplanner.web.calendars; import static org.navalplanner.web.I18nHelper._; -import java.util.Date; - +import org.joda.time.LocalDate; import org.navalplanner.business.calendars.entities.BaseCalendar; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.web.common.IMessagesForUser; @@ -102,7 +101,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { public void goToEditForm(BaseCalendar baseCalendar) { baseCalendarModel.initEdit(baseCalendar); assignEditionController(); - setSelectedDay(new Date()); + setSelectedDay(new LocalDate()); highlightDaysOnCalendar(); getVisibility().showOnly(editWindow); Util.reloadBindings(editWindow); @@ -135,13 +134,13 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { public void goToCreateForm() { baseCalendarModel.initCreate(); assignCreateController(); - setSelectedDay(new Date()); + setSelectedDay(new LocalDate()); highlightDaysOnCalendar(); getVisibility().showOnly(createWindow); Util.reloadBindings(createWindow); } - public void setSelectedDay(Date date) { + public void setSelectedDay(LocalDate date) { baseCalendarModel.setSelectedDay(date); reloadDayInformation(); @@ -223,7 +222,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { public void goToCreateDerivedForm(BaseCalendar baseCalendar) { baseCalendarModel.initCreateDerived(baseCalendar); assignCreateController(); - setSelectedDay(new Date()); + setSelectedDay(new LocalDate()); highlightDaysOnCalendar(); getVisibility().showOnly(createWindow); Util.reloadBindings(createWindow); @@ -236,7 +235,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { public void goToCreateCopyForm(BaseCalendar baseCalendar) { baseCalendarModel.initCreateCopy(baseCalendar); assignCreateController(); - setSelectedDay(new Date()); + setSelectedDay(new LocalDate()); highlightDaysOnCalendar(); getVisibility().showOnly(createWindow); Util.reloadBindings(createWindow); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java index 462c99faf..98af04e27 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java @@ -417,7 +417,7 @@ public abstract class BaseCalendarEditionController extends } private void reloadTypeDatesAndDuration() { - Date selectedDay = baseCalendarModel.getSelectedDay(); + LocalDate selectedDay = baseCalendarModel.getSelectedDay(); CalendarExceptionType type = baseCalendarModel .getCalendarExceptionType(new LocalDate(selectedDay)); @@ -439,9 +439,9 @@ public abstract class BaseCalendarEditionController extends Datebox dateboxStartDate = (Datebox) window .getFellow("exceptionStartDate"); - dateboxStartDate.setValue(selectedDay); + dateboxStartDate.setValue(toDate(selectedDay)); Datebox dateboxEndDate = (Datebox) window.getFellow("exceptionEndDate"); - dateboxEndDate.setValue(selectedDay); + dateboxEndDate.setValue(toDate(selectedDay)); capacityPicker.setValue(Capacity.create(baseCalendarModel .getWorkableTime())); } @@ -452,14 +452,28 @@ public abstract class BaseCalendarEditionController extends } public Date getSelectedDay() { - Date selectedDay = baseCalendarModel.getSelectedDay(); + Date selectedDay = toDate(baseCalendarModel.getSelectedDay()); if (selectedDay == null) { return new Date(); } return selectedDay; } - public void setSelectedDay(Date date) { + private static Date toDate(LocalDate date){ + if (date == null) { + return null; + } + return date.toDateTimeAtStartOfDay().toDate(); + } + + private static LocalDate toLocalDate(Date date) { + if (date == null) { + return null; + } + return LocalDate.fromDateFields(date); + } + + public void setSelectedDay(LocalDate date) { baseCalendarModel.setSelectedDay(date); reloadDayInformation(); @@ -600,21 +614,21 @@ public abstract class BaseCalendarEditionController extends } public Date getDateValidFrom() { - return baseCalendarModel.getDateValidFrom(); + return toDate(baseCalendarModel.getDateValidFrom()); } public void setDateValidFrom(Date date) { Component component = window.getFellow("dateValidFrom"); try { - baseCalendarModel.setDateValidFrom(date); + baseCalendarModel.setDateValidFrom(toLocalDate(date)); } catch (IllegalArgumentException e) { throw new WrongValueException(component, e.getMessage()); } catch (UnsupportedOperationException e) { throw new WrongValueException(component, e.getMessage()); } Clients.closeErrorBox(component); - baseCalendarModel.setSelectedDay(date); + baseCalendarModel.setSelectedDay(toLocalDate(date)); reloadCurrentWindow(); } @@ -626,15 +640,14 @@ public abstract class BaseCalendarEditionController extends Component component = window.getFellow("expiringDate"); try { - baseCalendarModel.setExpiringDate((new LocalDate(date)).plusDays(1) - .toDateTimeAtStartOfDay().toDate()); + baseCalendarModel.setExpiringDate(toLocalDate(date).plusDays(1)); } catch (IllegalArgumentException e) { throw new WrongValueException(component, e.getMessage()); } catch (UnsupportedOperationException e) { throw new WrongValueException(component, e.getMessage()); } Clients.closeErrorBox(component); - baseCalendarModel.setSelectedDay(date); + baseCalendarModel.setSelectedDay(toLocalDate(date)); reloadCurrentWindow(); } @@ -785,7 +798,7 @@ public abstract class BaseCalendarEditionController extends } public void goToDate(Date date) { - setSelectedDay(date); + setSelectedDay(toLocalDate(date)); reloadCurrentWindow(); } @@ -804,11 +817,11 @@ public abstract class BaseCalendarEditionController extends } } + public void acceptCreateNewVersion() { Component component = createNewVersionWindow .getFellow("dateValidFromNewVersion"); - Date date = ((Datebox) component).getValue(); - + LocalDate date = getLocalDateFrom((Datebox) component); try { baseCalendarModel.createNewVersion(date); } catch (IllegalArgumentException e) { @@ -822,6 +835,14 @@ public abstract class BaseCalendarEditionController extends reloadCurrentWindow(); } + private static LocalDate getLocalDateFrom(Datebox datebox) { + Date value = datebox.getValue(); + if (value == null) { + return null; + } + return LocalDate.fromDateFields(value); + } + public void cancelNewVersion() { creatingNewVersion = false; Util.reloadBindings(createNewVersionWindow); @@ -882,8 +903,7 @@ public abstract class BaseCalendarEditionController extends Listitem item = (Listitem) event.getTarget(); CalendarException calendarException = (CalendarException) item .getValue(); - setSelectedDay(calendarException - .getDate().toDateTimeAtStartOfDay().toDate()); + setSelectedDay(calendarException.getDate()); reloadDayInformation(); } } @@ -892,10 +912,9 @@ public abstract class BaseCalendarEditionController extends private void markAsSelected(Listitem item, CalendarException calendarException) { - Date selectedDay = baseCalendarModel.getSelectedDay(); + LocalDate selectedDay = baseCalendarModel.getSelectedDay(); if (selectedDay != null) { - if (calendarException.getDate().equals( - new LocalDate(selectedDay))) { + if (calendarException.getDate().equals(selectedDay)) { item.setSelected(true); } } @@ -1298,8 +1317,7 @@ public abstract class BaseCalendarEditionController extends if (item != null) { CalendarException calendarException = (CalendarException) item .getValue(); - setSelectedDay(calendarException.getDate().toDateTimeAtStartOfDay() - .toDate()); + setSelectedDay(calendarException.getDate()); reloadDayInformation(); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java index 005b5910a..4cb23eeac 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java @@ -74,7 +74,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements */ protected BaseCalendar baseCalendar; - private Date selectedDate; + private LocalDate selectedDate; protected boolean editing = false; @@ -243,14 +243,13 @@ public class BaseCalendarModel extends IntegrationEntityModel implements } @Override - public void setSelectedDay(Date date) { + public void setSelectedDay(LocalDate date) { this.selectedDate = date; } @Override - public Date getSelectedDay() { - return selectedDate != null ? new Date(this.selectedDate.getTime()) - : null; + public LocalDate getSelectedDay() { + return selectedDate; } @Override @@ -258,8 +257,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements if (getBaseCalendar() == null) { return null; } - return getBaseCalendar().getWorkableTimeAt( - LocalDate.fromDateFields(selectedDate)); + return getBaseCalendar().getWorkableTimeAt(selectedDate); } @Override @@ -404,7 +402,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements } @Override - public void setExpiringDate(Date date) { + public void setExpiringDate(LocalDate date) { if ((getBaseCalendar() != null) && (getBaseCalendar().getExpiringDate(selectedDate) != null)) { getBaseCalendar() @@ -413,20 +411,17 @@ public class BaseCalendarModel extends IntegrationEntityModel implements } @Override - public Date getDateValidFrom() { + public LocalDate getDateValidFrom() { if (getBaseCalendar() != null) { LocalDate validFromDate = getBaseCalendar().getValidFrom( selectedDate); - if (validFromDate != null) { - return validFromDate.toDateTimeAtStartOfDay().toDate(); - } + return validFromDate; } - return null; } @Override - public void setDateValidFrom(Date date) { + public void setDateValidFrom(LocalDate date) { if (getBaseCalendar() != null) { getBaseCalendar().setValidFrom(date, selectedDate); } @@ -442,7 +437,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements } @Override - public void createNewVersion(Date date) { + public void createNewVersion(LocalDate date) { if (getBaseCalendar() != null) { getBaseCalendar().newVersion(date); } @@ -631,11 +626,11 @@ public class BaseCalendarModel extends IntegrationEntityModel implements if (getBaseCalendar() == null) { return null; } - Date selectedDay = getSelectedDay(); + LocalDate selectedDay = getSelectedDay(); if (selectedDay == null) { return null; } - return getBaseCalendar().getCalendarData(new LocalDate(selectedDay)); + return getBaseCalendar().getCalendarData(selectedDay); } @Override diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java index a52810b21..24821d31e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java @@ -103,9 +103,9 @@ public interface IBaseCalendarModel extends IIntegrationEntityModel { boolean isEditing(); - void setSelectedDay(Date date); + void setSelectedDay(LocalDate date); - Date getSelectedDay(); + LocalDate getSelectedDay(); DayType getTypeOfDay(); @@ -138,15 +138,15 @@ public interface IBaseCalendarModel extends IIntegrationEntityModel { Date getExpiringDate(); - void setExpiringDate(Date date); + void setExpiringDate(LocalDate date); - Date getDateValidFrom(); + LocalDate getDateValidFrom(); - void setDateValidFrom(Date date); + void setDateValidFrom(LocalDate date); List getHistoryVersions(); - void createNewVersion(Date date); + void createNewVersion(LocalDate date); boolean isLastVersion(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java index 79bdc6d85..d9911c987 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java @@ -248,7 +248,7 @@ public class MachineCRUDController extends GenericForwardComposer { throw new RuntimeException(e); } - baseCalendarEditionController.setSelectedDay(new Date()); + baseCalendarEditionController.setSelectedDay(new LocalDate()); Util.reloadBindings(editCalendarWindow); Util.reloadBindings(createNewVersionWindow); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java index eb5b39e58..617cfbeea 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java @@ -419,7 +419,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements throw new RuntimeException(e); } - baseCalendarEditionController.setSelectedDay(new Date()); + baseCalendarEditionController.setSelectedDay(new LocalDate()); Util.reloadBindings(editCalendarWindow); Util.reloadBindings(createNewVersionWindow); } diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/calendars/BaseCalendarModelTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/calendars/BaseCalendarModelTest.java index 93de83797..149478088 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/calendars/BaseCalendarModelTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/calendars/BaseCalendarModelTest.java @@ -29,7 +29,6 @@ import static org.navalplanner.web.WebappGlobalNames.WEBAPP_SPRING_SECURITY_CONF import static org.navalplanner.web.test.WebappGlobalNames.WEBAPP_SPRING_CONFIG_TEST_FILE; import static org.navalplanner.web.test.WebappGlobalNames.WEBAPP_SPRING_SECURITY_CONFIG_TEST_FILE; -import java.util.Date; import java.util.List; import org.joda.time.LocalDate; @@ -76,7 +75,7 @@ public class BaseCalendarModelTest { assertThat(baseCalendarModel.getBaseCalendars().get(previous).getId(), equalTo(baseCalendar.getId())); assertThat(baseCalendarModel.getBaseCalendars().get(previous) - .getDurationAt(new Date(), Days.MONDAY), equalTo(hours(8))); + .getDurationAt(new LocalDate(), Days.MONDAY), equalTo(hours(8))); } private void setHours(BaseCalendar baseCalendar, Integer hours) { @@ -103,7 +102,7 @@ public class BaseCalendarModelTest { assertThat(baseCalendarModel.getBaseCalendars().get(previous).getId(), equalTo(baseCalendar.getId())); assertThat(baseCalendarModel.getBaseCalendars().get(previous) - .getDurationAt(new Date(), Days.MONDAY), equalTo(hours(4))); + .getDurationAt(new LocalDate(), Days.MONDAY), equalTo(hours(4))); } @Test @@ -114,8 +113,7 @@ public class BaseCalendarModelTest { BaseCalendar baseCalendar = baseCalendarModel.getBaseCalendars().get( previous); baseCalendarModel.initEdit(baseCalendar); - Date date = (new LocalDate()).plusWeeks(1) - .toDateTimeAtStartOfDay().toDate(); + LocalDate date = new LocalDate().plusWeeks(1); baseCalendarModel.createNewVersion(date); setHours(baseCalendarModel.getBaseCalendar(), 4); baseCalendarModel.confirmSave(); @@ -156,8 +154,7 @@ public class BaseCalendarModelTest { baseCalendarModel.getBaseCalendar().setName("Test"); setHours(baseCalendarModel.getBaseCalendar(), 8); BaseCalendar parent = baseCalendarModel.getBaseCalendar(); - baseCalendarModel.createNewVersion((new LocalDate()).plusMonths(1) - .toDateTimeAtStartOfDay().toDate()); + baseCalendarModel.createNewVersion(new LocalDate().plusMonths(1)); BaseCalendar parentNewVersion = baseCalendarModel.getBaseCalendar(); baseCalendarModel.confirmSave();