From 8b80e15ad66e6418a4efd22a38922fbdb12f4cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 18 Jan 2011 16:31:38 +0100 Subject: [PATCH] Rename method to reflect better meaning FEA: ItEr68OTS05IntroducionLimiteSobreasignacionCalendarios --- .../business/calendars/entities/BaseCalendar.java | 4 ++-- .../business/calendars/entities/CalendarData.java | 2 +- .../calendars/entities/CalendarExceptionType.java | 10 +++++----- .../business/calendars/entities/Capacity.java | 7 ++++--- .../business/test/calendars/entities/CapacityTest.java | 10 +++++----- .../web/common/components/CapacityPicker.java | 8 ++++---- .../impl/CalendarExceptionTypeConverter.java | 2 +- .../api/CalendarExceptionTypeServiceTest.java | 2 +- 8 files changed, 23 insertions(+), 22 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 5b96ff625..a7d5a9b1e 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 @@ -338,7 +338,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { private boolean isOverAssignable(LocalDate localDate) { CalendarException exceptionDay = getExceptionDay(localDate); if (exceptionDay != null) { - return exceptionDay.getType().isOverAssignable(); + return exceptionDay.getType().isOverAssignableWithoutLimit(); } return true; } @@ -1021,7 +1021,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { private boolean canWorkAt(CalendarException each) { return !each.getDuration().isZero() - || each.getType().isOverAssignable(); + || each.getType().isOverAssignableWithoutLimit(); } @Override 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 d4b5c37ea..b04a76b37 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 @@ -115,7 +115,7 @@ public class CalendarData extends IntegrationEntity { if (duration == null) { return null; } - return Capacity.create(duration).overAssignable(true); + return Capacity.create(duration).overAssignableWithoutLimit(true); } public EffortDuration getDurationAt(Days day) { 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 ae5e89061..cd2f449e8 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 @@ -84,7 +84,7 @@ public class CalendarExceptionType extends IntegrationEntity { this.name = name; this.color = color; this.capacity = Capacity.zero(); - this.capacity = this.capacity.overAssignable(!BooleanUtils + this.capacity = this.capacity.overAssignableWithoutLimit(!BooleanUtils .isTrue(notOverAssignable)); } @@ -117,17 +117,17 @@ public class CalendarExceptionType extends IntegrationEntity { /** * @return If more hours can be assigned on this day. */ - public boolean isOverAssignable() { - return capacity.isOverAssignable(); + public boolean isOverAssignableWithoutLimit() { + return capacity.isOverAssignableWithoutLimit(); } public void setOverAssignable(Boolean overAssignable) { - this.capacity = capacity.overAssignable(BooleanUtils + this.capacity = capacity.overAssignableWithoutLimit(BooleanUtils .isTrue(overAssignable)); } public String getOverAssignableStr() { - return isOverAssignable() ? _("Yes") : _("No"); + return isOverAssignableWithoutLimit() ? _("Yes") : _("No"); } public EffortDuration getDuration() { 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 c8a643f08..dd0abe4e0 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 @@ -75,7 +75,7 @@ public class Capacity { return allowedExtraEffort; } - public boolean isOverAssignable() { + public boolean isOverAssignableWithoutLimit() { return allowedExtraEffort == null; } @@ -87,8 +87,9 @@ public class Capacity { return new Capacity(standardEffort, allowedExtraEffort); } - public Capacity overAssignable(boolean overAssignable) { - if (overAssignable) { + public Capacity overAssignableWithoutLimit( + boolean overAssignableWithoutLimit) { + if (overAssignableWithoutLimit) { return new Capacity(standardEffort, null); } else { return new Capacity(standardEffort, diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CapacityTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CapacityTest.java index 7bd5ed11e..3e3d3efbf 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CapacityTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CapacityTest.java @@ -44,9 +44,9 @@ public class CapacityTest { } @Test - public void ifOnlyTheStandardCapacitySpecifiedIsOverAssignable() { + public void ifOnlyTheStandardCapacitySpecifiedIsOverAssignableWithoutLimit() { Capacity capacity = Capacity.create(hours(8)); - assertTrue(capacity.isOverAssignable()); + assertTrue(capacity.isOverAssignableWithoutLimit()); } @Test @@ -56,9 +56,9 @@ public class CapacityTest { } @Test - public void ifHasAllowedExtraEffortItsNotOverassignable() { + public void ifHasAllowedExtraEffortItsNotOverassignableWithoutLimit() { Capacity capacity = Capacity.create(hours(8)).extraEffort(hours(0)); - assertFalse(capacity.isOverAssignable()); + assertFalse(capacity.isOverAssignableWithoutLimit()); } @Test @@ -75,7 +75,7 @@ public class CapacityTest { @Test public void aZeroCapacityIsNotOverAssignable() { - assertFalse(Capacity.zero().isOverAssignable()); + assertFalse(Capacity.zero().isOverAssignableWithoutLimit()); } @Test 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 e4a9b0a3e..6e8bc5f56 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 @@ -103,13 +103,13 @@ public class CapacityPicker { @Override public Boolean get() { - return currentCapacity.isOverAssignable(); + return currentCapacity.isOverAssignableWithoutLimit(); } }, new Setter() { @Override public void set(Boolean value) { - updateCapacity(currentCapacity.overAssignable(BooleanUtils + updateCapacity(currentCapacity.overAssignableWithoutLimit(BooleanUtils .isTrue(value))); updateExtraEffortDisability(extraEffortPicker); } @@ -120,7 +120,7 @@ public class CapacityPicker { private void updateExtraEffortDisability( EffortDurationPicker extraHoursPicker) { - extraHoursPicker.setDisabled(currentCapacity.isOverAssignable()); + extraHoursPicker.setDisabled(currentCapacity.isOverAssignableWithoutLimit()); } private void updateCapacity(Capacity newCapacity) { @@ -136,7 +136,7 @@ public class CapacityPicker { public void setValue(Capacity capacity) { overAssignableWithoutLimitCheckbox.setChecked(capacity - .isOverAssignable()); + .isOverAssignableWithoutLimit()); standardEffortPicker.setValue(capacity.getStandardEffort()); extraEffortPicker.setValue(capacity.getAllowedExtraEffort()); currentCapacity = capacity; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeConverter.java index 16cdcdcf4..8d7707112 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeConverter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeConverter.java @@ -41,7 +41,7 @@ public final class CalendarExceptionTypeConverter { int seconds = (duration != null) ? duration.getSeconds() : 0; return new CalendarExceptionTypeDTO(calendarExceptionType.getCode(), calendarExceptionType.getName(), calendarExceptionType - .getColor(), calendarExceptionType.isOverAssignable(), + .getColor(), calendarExceptionType.isOverAssignableWithoutLimit(), seconds); } diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/calendarexceptiontypes/api/CalendarExceptionTypeServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/calendarexceptiontypes/api/CalendarExceptionTypeServiceTest.java index e158733e0..44f5e87b3 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/calendarexceptiontypes/api/CalendarExceptionTypeServiceTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/calendarexceptiontypes/api/CalendarExceptionTypeServiceTest.java @@ -101,7 +101,7 @@ public class CalendarExceptionTypeServiceTest { assertThat(calendarExceptionTypeDTO.color, equalTo(calendarExceptionType.getColor())); assertThat(calendarExceptionTypeDTO.overAssignable, - equalTo(calendarExceptionType.isOverAssignable())); + equalTo(calendarExceptionType.isOverAssignableWithoutLimit())); } }