diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java index b0ad43822..d46989143 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java @@ -287,7 +287,7 @@ public class Gap implements Comparable { */ public boolean canFit(LimitingResourceQueueElement candidate) { LocalDate startAfter = LocalDate.fromDateFields(candidate - .getEarlierStartDateBecauseOfGantt()); + .getEarliestStartDateBecauseOfGantt()); LocalDate endsAfter = LocalDate.fromDateFields(candidate .getEarliestEndDateBecauseOfGantt()); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/InsertionRequirements.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/InsertionRequirements.java index cf9a0842c..77bd996e6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/InsertionRequirements.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/InsertionRequirements.java @@ -92,7 +92,7 @@ public class InsertionRequirements { LimitingResourceQueueElement element, List dependenciesAffectingStart) { return DateAndHour.max(asDateAndHour(element - .getEarlierStartDateBecauseOfGantt()), + .getEarliestStartDateBecauseOfGantt()), max(dependenciesAffectingStart)); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java index 7e1b5c900..30ee81461 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java @@ -267,7 +267,7 @@ public class LimitingResourceAllocator { } private static DateAndHour getStartTimeBecauseOfGantt(LimitingResourceQueueElement element) { - return new DateAndHour(new LocalDate(element.getEarlierStartDateBecauseOfGantt()), 0); + return new DateAndHour(new LocalDate(element.getEarliestStartDateBecauseOfGantt()), 0); } private static Gap createLastGap( diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java index 50e43b2f5..c2b1dd1ca 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java @@ -170,7 +170,7 @@ public class LimitingResourceQueueElement extends BaseEntity { return new Duration(start, end); } - public Date getEarlierStartDateBecauseOfGantt() { + public Date getEarliestStartDateBecauseOfGantt() { return earlierStartDateBecauseOfGantt; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java index 026ab0cb3..2072ddee6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java @@ -238,7 +238,7 @@ public class LimitingResourcesController extends GenericForwardComposer { final Order order = limitingResourceQueueModel.getOrderByTask(task); return new LimitingResourceQueueElementDTO(element, order .getName(), task.getName(), element - .getEarlierStartDateBecauseOfGantt()); + .getEarliestStartDateBecauseOfGantt()); } public static String getResourceOrCriteria( @@ -384,7 +384,7 @@ public class LimitingResourcesController extends GenericForwardComposer { LimitingResourceQueueElement dest) { dest.setEarlierStartDateBecauseOfGantt(source - .getEarlierStartDateBecauseOfGantt()); + .getEarliestStartDateBecauseOfGantt()); for (LimitingResourceQueueDependency each : source .getDependenciesAsOrigin()) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java index 6d469f146..f99a9bd05 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java @@ -140,7 +140,7 @@ public class ManualAllocationController extends GenericForwardComposer { } private DateAndHour getStartDayBecauseOfGantt(LimitingResourceQueueElement element) { - return new DateAndHour(new LocalDate(element.getEarlierStartDateBecauseOfGantt()), 0); + return new DateAndHour(new LocalDate(element.getEarliestStartDateBecauseOfGantt()), 0); } private void feedValidGapsSince(LimitingResourceQueueElement element, LimitingResourceQueue queue, DateAndHour since) { @@ -176,7 +176,7 @@ public class ManualAllocationController extends GenericForwardComposer { selectStartDate.setSelected(true); startAllocationDate.setDisabled(false); - startAllocationDate.setValue(beingEdited.getEarlierStartDateBecauseOfGantt()); + startAllocationDate.setValue(beingEdited.getEarliestStartDateBecauseOfGantt()); } else { listCandidateGaps.setDisabled(false); @@ -314,7 +314,7 @@ public class ManualAllocationController extends GenericForwardComposer { final LocalDate selectedDay = new LocalDate(startAllocationDate.getValue()); if (isAppropriative()) { LimitingResourceQueueElement beingEdited = getBeingEditedElement(); - if (selectedDay.compareTo(new LocalDate(beingEdited.getEarlierStartDateBecauseOfGantt())) < 0) { + if (selectedDay.compareTo(new LocalDate(beingEdited.getEarliestStartDateBecauseOfGantt())) < 0) { throw new WrongValueException(startAllocationDate, _("Day is not valid")); } return new DateAndHour(selectedDay, 0); @@ -403,7 +403,7 @@ public class ManualAllocationController extends GenericForwardComposer { if (isAppropriative()) { final LimitingResourceQueueElement beingEdited = getBeingEditedElement(); - highlightDaysFromDate(datebox.getUuid(), new LocalDate(beingEdited.getEarlierStartDateBecauseOfGantt())); + highlightDaysFromDate(datebox.getUuid(), new LocalDate(beingEdited.getEarliestStartDateBecauseOfGantt())); } else { highlightDaysInGap(datebox.getUuid(), getSelectedGap()); }