From 540294af8751d076ce587ba124f3557915fedd23 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 00:41:38 +0100
Subject: [PATCH] ItEr50S04ValidacionEProbasFuncionaisItEr49S04: Applying
 several refactorings to simplify the reload method

---
 .../main/java/org/zkoss/ganttz/TaskList.java  | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
index b9913d46c..a158157e8 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
@@ -318,10 +318,6 @@ public class TaskList extends XulElement implements AfterCompose {
         response("adjust_height", new AuInvoke(TaskList.this, "adjust_height"));
     }
 
-    public void hideTaskComponent(TaskComponent subtaskComponent) {
-        removeChild(subtaskComponent.getRow());
-    }
-
     public void redrawDependencies() {
         getGanttPanel().getDependencyList().redrawDependencies();
     }
@@ -359,27 +355,27 @@ public class TaskList extends XulElement implements AfterCompose {
                 addPendingTasks(tasksPendingToAdd, rowFor(task),
                         relocate);
             }
-
-            if (predicate.accepts(task)) {
-                if (!visibleTasks.contains(task)) {
+            final boolean isShown = visibleTasks.contains(task);
+            if (predicate.accepts(task) != isShown) {
+                if (isShown) {
+                    makeDisappear(task);
+                } else {
                     tasksPendingToAdd.add(task);
                 }
-            } else {
-                if (visibleTasks.contains(task)) {
-                    TaskComponent taskComponent = find(task);
-                    hideTaskComponent(taskComponent);
-
-                    visibleTasks.remove(task);
-                    task.setVisible(false);
-                }
             }
-
             if (task instanceof TaskContainer) {
                 reload(task.getTasks(), tasksPendingToAdd, relocate);
             }
         }
     }
 
+    private void makeDisappear(Task task) {
+        TaskComponent taskComponent = find(task);
+        removeChild(taskComponent.getRow());
+        visibleTasks.remove(task);
+        task.setVisible(false);
+    }
+
     private TaskRow rowFor(Task task) {
         TaskComponent taskComponent = find(task);
         return taskComponent == null ? null : taskComponent.getRow();