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

[Bug #645] Rewrite findWorkersMatching using IResourcesSearchModel

Browse source 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
This commit is contained in:
Óscar González Fernández 2010-09-20 18:49:16 +02:00
parent c082a34640
commit 974cbdfd22
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,13 +110,14 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
.addSpecificResourceAllocationFor(reloadResources(resources));
}
private List<Resource> reloadResources(
Collection<? extends Resource> resources) {
List<Resource> result = new ArrayList<Resource>();
for (Resource each : resources) {
@SuppressWarnings("unchecked")
private <T extends Resource> List<T> reloadResources(
Collection<? extends T> resources) {
List<T> result = new ArrayList<T>();
for (T each : resources) {
Resource reloaded = resourceDAO.findExistingEntity(each.getId());
reattachResource(reloaded);
result.add(reloaded);
result.add((T) reloaded);
}
return result;
}
@ -263,17 +264,14 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
@Override
public Collection<Worker> findWorkersMatching(
Collection<? extends Criterion> requiredCriterions) {
Collection<? extends Criterion> requiredCriteria) {
reassociateResourcesWithSession();
List<Resource> allSatisfyingCriterions;
if (!requiredCriterions.isEmpty()) {
allSatisfyingCriterions = resourceDAO
.findSatisfyingAllCriterionsAtSomePoint(requiredCriterions);
} else {
allSatisfyingCriterions = new ArrayList<Resource>();
List<Worker> workers = new ArrayList<Worker>();
if (!requiredCriteria.isEmpty()) {
workers = searchModel.searchWorkers()
.byCriteria(requiredCriteria).execute();
}
return Resource.workers(reloadResources(Resource
.workers(allSatisfyingCriterions)));
return reloadResources(workers);
}
};
}