From 150eacae86cb367437cdf15b2f131fabf4ec8449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Tue, 9 Feb 2010 21:44:33 +0100
Subject: [PATCH] ItEr47S04ValidacionEProbasFuncionaisItEr46S04: [Bug #276]
 Adding prefixes with the name of the topmost task.

---
 .../business/planner/entities/TaskElement.java         |  8 ++++++++
 .../web/resourceload/ResourceLoadModel.java            | 10 ++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
index 94a2ca75b..68e715bac 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
@@ -398,4 +398,12 @@ public abstract class TaskElement extends BaseEntity {
         return false;
     }
 
+    public TaskElement getTopMost() {
+        TaskElement result = this;
+        while (result.getParent() != null) {
+            result = result.getParent();
+        }
+        return result;
+    }
+
 }
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 0f7ecf64e..8c49fb741 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
@@ -262,8 +262,8 @@ public class ResourceLoadModel implements IResourceLoadModel {
                 .byTask(sortedByStartDate);
         List<LoadTimeLine> secondLevel = new ArrayList<LoadTimeLine>();
         for (Entry<Task, List<ResourceAllocation<?>>> entry : byTask.entrySet()) {
-            LoadTimeLine timeLine = buildTimeLine(resource, entry.getKey()
-                    .getName(),
+            Task task = entry.getKey();
+            LoadTimeLine timeLine = buildTimeLine(resource, getTaskName(task),
                     entry.getValue());
             if (!timeLine.isEmpty()) {
                 secondLevel.add(timeLine);
@@ -272,6 +272,12 @@ public class ResourceLoadModel implements IResourceLoadModel {
         return secondLevel;
     }
 
+    private String getTaskName(Task task) {
+        TaskElement topMost = task.getTopMost();
+        String prefix = topMost != task ? (topMost.getName() + " :: ") : "";
+        return prefix + task.getName();
+    }
+
     private LoadTimeLine buildTimeLine(Collection<Criterion> criterions,
             Resource resource,
             List<GenericResourceAllocation> allocationsSortedByStartDate) {