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

ItEr20S04ArquitecturaServidorItEr19S04: Removing sortByStartDate since by default is sorted that way.

Browse source
This commit is contained in:
Óscar González Fernández 2009-08-07 18:09:31 +02:00
parent d9aa8fa13f
commit b8271ef724
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
View file

@ -98,10 +98,12 @@ public abstract class Resource extends BaseEntity {
});
}
public Query sortByStartDate() {
return this;
}
/**
* Method called to retrieve the result. If no predicate was set, it
* returns all satisfactions
* @return the satisfactions matched by all predicates specified ordered
* by start date.
*/
public List<CriterionSatisfaction> result() {
ArrayList<CriterionSatisfaction> result = new ArrayList<CriterionSatisfaction>();
for (CriterionSatisfaction criterionSatisfaction : criterionSatisfactions) {
@ -341,8 +343,7 @@ public abstract class Resource extends BaseEntity {
private CriterionSatisfaction getNext(ICriterionType<?> type,
CriterionSatisfaction newSatisfaction) {
List<CriterionSatisfaction> ordered = query().from(type)
.sortByStartDate().result();
List<CriterionSatisfaction> ordered = query().from(type).result();
int position = findPlace(ordered, newSatisfaction);
CriterionSatisfaction next = position != ordered.size() ? ordered
.get(position) : null;
@ -351,8 +352,7 @@ public abstract class Resource extends BaseEntity {
private CriterionSatisfaction getPrevious(ICriterionType<?> type,
CriterionSatisfaction newSatisfaction) {
List<CriterionSatisfaction> ordered = query().from(type)
.sortByStartDate().result();
List<CriterionSatisfaction> ordered = query().from(type).result();
int position = findPlace(ordered, newSatisfaction);
CriterionSatisfaction previous = position > 0 ? ordered
.get(position - 1) : null;
@ -371,7 +371,7 @@ public abstract class Resource extends BaseEntity {
for (CriterionType criterionType : types) {
if (!criterionType.allowSimultaneousCriterionsPerResource()) {
List<CriterionSatisfaction> satisfactions = query().from(
criterionType).sortByStartDate().result();
criterionType).result();
ListIterator<CriterionSatisfaction> listIterator = satisfactions
.listIterator();
while (listIterator.hasNext()) {

8
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java
View file

@ -179,7 +179,7 @@ public class WorkerModel implements IWorkerModel {
@Override
@Transactional(readOnly = true)
public void unassignSatisfactions(
Collection<? extends CriterionSatisfaction> satisfactions) {
Collection<? extends CriterionSatisfaction> satisfactions) {
/* Check worker's version. */
Worker worker = getWorker();
@ -380,9 +380,7 @@ public class WorkerModel implements IWorkerModel {
}
@Override
public List<CriterionSatisfaction>
getLaboralRelatedCriterionSatisfactions() {
return worker.query().oneOf(laboralRelatedTypes).sortByStartDate()
.result();
public List<CriterionSatisfaction> getLaboralRelatedCriterionSatisfactions() {
return worker.query().oneOf(laboralRelatedTypes).result();
}
}