From 0549f8d22bdf524f51611ea476bd1d81114837bb Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Thu, 11 Nov 2010 12:25:39 +0100
Subject: [PATCH] Fix bug discard TaskGroups in CriticalPath

FEA: ItEr63OTS06MonteCarlo
---
 .../web/montecarlo/IMonteCarloModel.java            |  4 ++--
 .../web/montecarlo/MonteCarloModel.java             | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/IMonteCarloModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/IMonteCarloModel.java
index d79762fc2..9786da2a8 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/IMonteCarloModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/IMonteCarloModel.java
@@ -26,7 +26,7 @@ import java.util.Map;
 
 import org.joda.time.LocalDate;
 import org.navalplanner.business.orders.entities.Order;
-import org.navalplanner.business.planner.entities.Task;
+import org.navalplanner.business.planner.entities.TaskElement;
 
 
 /**
@@ -39,7 +39,7 @@ public interface IMonteCarloModel {
 
     Map<LocalDate, BigDecimal> calculateMonteCarlo(int times);
 
-    void setCriticalPath(Order order, List<Task> criticalPath);
+    void setCriticalPath(Order order, List<TaskElement> criticalPath);
 
     String getOrderName();
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java
index 2ec922384..5e0609b74 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java
@@ -36,6 +36,7 @@ import org.apache.commons.lang.Validate;
 import org.joda.time.LocalDate;
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.planner.entities.Task;
+import org.navalplanner.business.planner.entities.TaskElement;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
@@ -55,15 +56,17 @@ public class MonteCarloModel implements IMonteCarloModel {
     private Map<MonteCarloTask, Set<EstimationRange>> estimationRangesForTasks = new HashMap<MonteCarloTask, Set<EstimationRange>>();
 
     @Override
-    @Transactional(readOnly=true)
-    public void setCriticalPath(Order order, List<Task> criticalPath) {
+    @Transactional(readOnly = true)
+    public void setCriticalPath(Order order, List<TaskElement> criticalPath) {
         this.criticalPath.clear();
-        for (Task each: sortByStartDate(criticalPath)) {
-            this.criticalPath.add(MonteCarloTask.create(each));
+        for (TaskElement each : sortByStartDate(criticalPath)) {
+            if (each instanceof Task) {
+                this.criticalPath.add(MonteCarloTask.create((Task) each));
+            }
         }
     }
 
-    private List<Task> sortByStartDate(List<Task> tasks) {
+    private List<TaskElement> sortByStartDate(List<TaskElement> tasks) {
         Collections.sort(tasks, Task.getByStartDateComparator());
         return tasks;
     }