RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use name for method more consistent with field name

Browse source 
FEA: ItEr68OTS05IntroducionLimiteSobreasignacionCalendarios
This commit is contained in:
Óscar González Fernández 2011-01-17 18:57:09 +01:00
parent 100a863969
commit 3bc59e3b41
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarException.java
View file

@ -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) {

2
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
View file

@ -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

2
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java
View file

@ -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);
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CapacityPicker.java
View file

@ -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<EffortDuration>() {