From b8271ef7249caf90a23399349ee3313a1394b409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Fri, 7 Aug 2009 18:09:31 +0200
Subject: [PATCH] ItEr20S04ArquitecturaServidorItEr19S04: Removing
 sortByStartDate since by default is sorted that way.

---
 .../business/resources/entities/Resource.java  | 18 +++++++++---------
 .../web/resources/worker/WorkerModel.java      |  8 +++-----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
index da32a5b36..c7d6abed3 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
@@ -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()) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java
index 51812aa93..da2a2e89d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java
@@ -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();
     }
 }
\ No newline at end of file