From 0610cb29939ee381b8539013320ddd8e5ce339a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 19 Oct 2009 00:06:59 +0200
Subject: [PATCH] ItEr30S17ValidacionEProbasFuncionais: Sorting the allocations
 is required by joining algorithm.

bug #48
---
 .../navalplanner/web/resourceload/ResourceLoadModel.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
index dc94400fe..8c91a8b59 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
@@ -153,9 +153,10 @@ public class ResourceLoadModel implements IResourceLoadModel {
         List<LoadTimelinesGroup> result = new ArrayList<LoadTimelinesGroup>();
         for (Entry<Criterion, List<GenericResourceAllocation>> entry : genericAllocationsByCriterion
                 .entrySet()) {
+            List<GenericResourceAllocation> allocations = ResourceAllocation
+                    .sortedByStartDate(entry.getValue());
             LoadTimelinesGroup group = new LoadTimelinesGroup(createPrincipal(
-                    entry.getKey(),
-                            entry.getValue()), new ArrayList<LoadTimeLine>());
+                    entry.getKey(), allocations), new ArrayList<LoadTimeLine>());
             if (!group.isEmpty()) {
                 result.add(group);
             }
@@ -164,9 +165,9 @@ public class ResourceLoadModel implements IResourceLoadModel {
     }
 
     private LoadTimeLine createPrincipal(Criterion criterion,
-            List<GenericResourceAllocation> value) {
+            List<GenericResourceAllocation> orderedAllocations) {
         return new LoadTimeLine(criterion.getName(), createPeriods(criterion,
-                value));
+                orderedAllocations));
     }
 
     private List<LoadPeriod> createPeriods(Criterion criterion,