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

Convert withHours method to withDuration method

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-15 16:40:35 +02:00
parent ff38c78835
commit 4e697d5c5d
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
View file

@ -258,6 +258,6 @@ public abstract class DayAssignment extends BaseEntity {
*/
public abstract Scenario getScenario();
public abstract DayAssignment withHours(int newHours);
public abstract DayAssignment withDuration(EffortDuration newDuration);
}

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedDayAssignment.java
View file

@ -175,7 +175,7 @@ public class DerivedDayAssignment extends DayAssignment {
}
@Override
public DayAssignment withHours(int newHours) {
public DayAssignment withDuration(EffortDuration newDuration) {
throw new UnsupportedOperationException();
}

5
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java
View file

@ -218,8 +218,9 @@ public class GenericDayAssignment extends DayAssignment {
return parentState.getScenario();
}
public DayAssignment withHours(int newHours) {
GenericDayAssignment result = create(getDay(), newHours, getResource());
public DayAssignment withDuration(EffortDuration newDuration) {
GenericDayAssignment result = create(getDay(), newDuration,
getResource());
if (container != null) {
result.parentState.setParent(container);
} else if (this.getGenericResourceAllocation() != null) {

5
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java
View file

@ -205,8 +205,9 @@ public class SpecificDayAssignment extends DayAssignment {
}
@Override
public DayAssignment withHours(int newHours) {
SpecificDayAssignment result = create(getDay(), newHours, getResource());
public DayAssignment withDuration(EffortDuration newDuration) {
SpecificDayAssignment result = create(getDay(), newDuration,
getResource());
if (container != null) {
result.parentState.setParent(container);
} else if (this.getSpecificResourceAllocation() != null) {

6
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java
View file

@ -20,12 +20,13 @@
package org.navalplanner.business.planner.limiting.entities;
import static org.navalplanner.business.workingday.EffortDuration.hours;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Set;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.ResourceCalendar;
@ -35,7 +36,6 @@ import org.navalplanner.business.planner.entities.GenericResourceAllocation;
import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.SpecificDayAssignment;
import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.LimitingResourceQueue;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.business.workingday.ResourcesPerDay;
@ -301,7 +301,7 @@ public class LimitingResourceAllocator {
if (hoursTaken == current.getHours()) {
listIterator.remove();
} else {
listIterator.set(current.withHours(hoursTaken));
listIterator.set(current.withDuration(hours(hoursTaken)));
}
}
}