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

ItEr27S06CUAsignacionGrupoRecursosAPlanificacionItEr26S07: Moving ResourceAllocationWithDesiredResourcesPerDay to top level and allocationalgorithms package

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-21 18:01:46 +02:00
parent 37497a3b13
commit 5fa07daa1d
5 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -17,6 +17,7 @@ import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay;
import org.navalplanner.business.common.BaseEntity;
import org.navalplanner.business.planner.entities.allocationalgorithms.AllocatorForTaskDurationAndSpecifiedResourcesPerDay;
import org.navalplanner.business.planner.entities.allocationalgorithms.ResourceAllocationWithDesiredResourcesPerDay;
import org.navalplanner.business.resources.entities.Resource;
/**
@ -26,28 +27,6 @@ import org.navalplanner.business.resources.entities.Resource;
public abstract class ResourceAllocation<T extends DayAssignment> extends
BaseEntity {
public static class ResourceAllocationWithDesiredResourcesPerDay {
private final ResourceAllocation<?> resourceAllocation;
private final ResourcesPerDay resourcesPerDay;
public ResourceAllocationWithDesiredResourcesPerDay(
ResourceAllocation<?> resourceAllocation,
ResourcesPerDay resourcesPerDay) {
this.resourceAllocation = resourceAllocation;
this.resourcesPerDay = resourcesPerDay;
}
public ResourceAllocation<?> getResourceAllocation() {
return resourceAllocation;
}
public ResourcesPerDay getResourcesPerDay() {
return resourcesPerDay;
}
}
public static AllocationsCurried allocating(
List<ResourceAllocationWithDesiredResourcesPerDay> resourceAllocations) {
return new AllocationsCurried(resourceAllocations);

1
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocatorForTaskDurationAndSpecifiedResourcesPerDay.java
View file

@ -6,7 +6,6 @@ import org.navalplanner.business.planner.entities.GenericResourceAllocation;
import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.ResourcesPerDay;
import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.planner.entities.ResourceAllocation.ResourceAllocationWithDesiredResourcesPerDay;
import org.navalplanner.business.resources.entities.Resource;
public class AllocatorForTaskDurationAndSpecifiedResourcesPerDay {

26
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java Normal file
View file

@ -0,0 +1,26 @@
package org.navalplanner.business.planner.entities.allocationalgorithms;
import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.ResourcesPerDay;
public class ResourceAllocationWithDesiredResourcesPerDay {
private final ResourceAllocation<?> resourceAllocation;
private final ResourcesPerDay resourcesPerDay;
public ResourceAllocationWithDesiredResourcesPerDay(
ResourceAllocation<?> resourceAllocation,
ResourcesPerDay resourcesPerDay) {
this.resourceAllocation = resourceAllocation;
this.resourcesPerDay = resourcesPerDay;
}
public ResourceAllocation<?> getResourceAllocation() {
return resourceAllocation;
}
public ResourcesPerDay getResourcesPerDay() {
return resourcesPerDay;
}
}

2
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java
View file

@ -18,7 +18,7 @@ import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.ResourcesPerDay;
import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.ResourceAllocation.ResourceAllocationWithDesiredResourcesPerDay;
import org.navalplanner.business.planner.entities.allocationalgorithms.ResourceAllocationWithDesiredResourcesPerDay;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.business.resources.entities.Worker;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
View file

@ -18,7 +18,7 @@ import org.navalplanner.business.planner.entities.GenericResourceAllocation;
import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.ResourceAllocation.ResourceAllocationWithDesiredResourcesPerDay;
import org.navalplanner.business.planner.entities.allocationalgorithms.ResourceAllocationWithDesiredResourcesPerDay;
import org.navalplanner.business.resources.daos.IResourceDAO;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.CriterionSatisfaction;