From 388fc0c48e4ae0eb678f8e06598dbb6589e3404e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 10 Mar 2010 01:08:06 +0100
Subject: [PATCH] ItEr50S04ValidacionEProbasFuncionaisItEr49S04: Providing just
 what is needed to create a TaskComponent.

TaskComponents no longer needs the TaskList, they just need the IDisabilityConfiguration
---
 .../java/org/zkoss/ganttz/TaskComponent.java   | 18 +++++++++---------
 .../zkoss/ganttz/TaskContainerComponent.java   | 14 +++++++-------
 .../main/java/org/zkoss/ganttz/TaskList.java   |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
index 413054d06..109886646 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
@@ -151,29 +151,29 @@ public class TaskComponent extends Div implements AfterCompose {
         }
     };
 
-    private final IDisabilityConfiguration disabilityConfiguration;
+    protected final IDisabilityConfiguration disabilityConfiguration;
 
     private PropertyChangeListener criticalPathPropertyListener;
 
-    public static TaskComponent asTaskComponent(Task task, TaskList taskList,
+    public static TaskComponent asTaskComponent(Task task,
+            IDisabilityConfiguration disabilityConfiguration,
             boolean isTopLevel) {
         final TaskComponent result;
         if (task.isContainer()) {
             result = TaskContainerComponent.asTask((TaskContainer) task,
-                    taskList);
+                    disabilityConfiguration);
         } else if (task instanceof Milestone) {
-            result = new MilestoneComponent(task, taskList
-                    .getDisabilityConfiguration());
+            result = new MilestoneComponent(task, disabilityConfiguration);
         } else {
-            result = new TaskComponent(task, taskList
-                    .getDisabilityConfiguration());
+            result = new TaskComponent(task, disabilityConfiguration);
         }
         result.isTopLevel = isTopLevel;
         return TaskRow.wrapInRow(result);
     }
 
-    public static TaskComponent asTaskComponent(Task task, TaskList taskList) {
-        return asTaskComponent(task, taskList, true);
+    public static TaskComponent asTaskComponent(Task task,
+            IDisabilityConfiguration disabilityConfiguration) {
+        return asTaskComponent(task, disabilityConfiguration, true);
     }
 
     private IReloadResourcesTextRequested reloadResourcesTextRequested;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java
index 92a202421..2e55b33e3 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
+import org.zkoss.ganttz.adapters.IDisabilityConfiguration;
 import org.zkoss.ganttz.data.Task;
 import org.zkoss.ganttz.data.TaskContainer;
 import org.zkoss.ganttz.data.TaskContainer.IExpandListener;
@@ -39,23 +40,21 @@ public class TaskContainerComponent extends TaskComponent implements
         AfterCompose {
 
     public static TaskContainerComponent asTask(Task taskContainerBean,
-            TaskList taskList) {
+            IDisabilityConfiguration disabilityConfiguration) {
         return new TaskContainerComponent((TaskContainer) taskContainerBean,
-                taskList);
+                disabilityConfiguration);
     }
 
     private List<TaskComponent> subtaskComponents = new ArrayList<TaskComponent>();
-    private final TaskList taskList;
 
     private transient IExpandListener expandListener;
 
     public TaskContainerComponent(final TaskContainer taskContainer,
-            final TaskList taskList) {
-        super(taskContainer, taskList.getDisabilityConfiguration());
+            final IDisabilityConfiguration disabilityConfiguration) {
+        super(taskContainer, disabilityConfiguration);
         if (!taskContainer.isContainer()) {
             throw new IllegalArgumentException();
         }
-        this.taskList = taskList;
         this.expandListener = new IExpandListener() {
 
             @Override
@@ -70,7 +69,8 @@ public class TaskContainerComponent extends TaskComponent implements
     }
 
     private TaskComponent createChild(Task task) {
-        return TaskComponent.asTaskComponent(task, this.taskList, false);
+        return TaskComponent.asTaskComponent(task, disabilityConfiguration,
+                false);
     }
 
     @Override
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
index a158157e8..263b8561f 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
@@ -235,8 +235,8 @@ public class TaskList extends XulElement implements AfterCompose {
         for (Task task : newTasks) {
             TaskComponent taskComponent = taskComponentByTask.get(task);
             if (taskComponent == null) {
-                taskComponent = TaskComponent.asTaskComponent(
-                        task, this);
+                taskComponent = TaskComponent.asTaskComponent(task,
+                        disabilityConfiguration);
                 taskComponent.publishTaskComponents(taskComponentByTask);
             }
             if (task.isContainer()) {