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 6d7aca536..4b59473e3 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 @@ -60,7 +60,7 @@ public class CalendarException extends IntegrationEntity { private static Capacity from(EffortDuration duration, CalendarExceptionType type) { - return type.getCapacity().withNormalDuration(duration); + return type.getCapacity().withStandardEffort(duration); } private static EffortDuration fromHours(Integer hours) { @@ -74,7 +74,7 @@ public class CalendarException extends IntegrationEntity { } if (hours != null) { - this.capacity.withNormalDuration(fromHours(hours)); + this.capacity.withStandardEffort(fromHours(hours)); } if (type != null) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java index b42777d37..0b6e1229c 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java @@ -157,7 +157,7 @@ public class CalendarExceptionType extends IntegrationEntity { } public void setDuration(EffortDuration duration) { - this.capacity = this.capacity.withNormalDuration(duration); + this.capacity = this.capacity.withStandardEffort(duration); } @Override diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java index 6854b50a6..ab889bbf6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java @@ -78,7 +78,7 @@ public class Capacity { return new Capacity(standardEffort, extraEffort); } - public Capacity withNormalDuration(EffortDuration standardEffort) { + public Capacity withStandardEffort(EffortDuration standardEffort) { return new Capacity(standardEffort, allowedExtraEffort); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CapacityPicker.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CapacityPicker.java index a65b31c28..f76d210fe 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CapacityPicker.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CapacityPicker.java @@ -63,7 +63,7 @@ public class CapacityPicker { @Override public void set(EffortDuration value) { - updateCapacity(currentCapacity.withNormalDuration(value)); + updateCapacity(currentCapacity.withStandardEffort(value)); } }); extraEffortPicker.bind(new Getter() {