From 4edfd0f2ab95609562fdd7127de0edd76f1177c8 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 17 Nov 2011 14:51:19 +0100
Subject: [PATCH] [Bug #1269] Fix previous commit as it was not working
 properly

FEA: ItEr75S04BugFixing
---
 .../main/java/org/zkoss/ganttz/Planner.java   |  5 ++++-
 .../company/CompanyPlanningController.java    | 20 +++----------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index c038589b1..75ca24c75 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -873,7 +873,10 @@ public class Planner extends HtmlMacroComponent  {
     }
 
     public void updateCompletion(String progressType) {
-        getTaskList().updateCompletion(progressType);
+        TaskList taskList = getTaskList();
+        if (taskList != null) {
+            taskList.updateCompletion(progressType);
+        }
     }
 
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
index 855deb41d..818bf8e89 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
@@ -164,13 +164,9 @@ public class CompanyPlanningController implements Composer {
 
         cbProgressTypes.setVisible(true);
 
-        Comboitem item = findListitemValue(cbProgressTypes,
-                getProgressTypeFromConfiguration());
-
-        if (item != null) {
-            cbProgressTypes.setSelectedItem(item);
-            planner.updateCompletion(((ProgressType) item.getValue())
-                    .toString());
+        ProgressType progressType = getProgressTypeFromConfiguration();
+        if (progressType != null) {
+            planner.updateCompletion(progressType.toString());
         }
 
     }
@@ -185,16 +181,6 @@ public class CompanyPlanningController implements Composer {
         }
     }
 
-    private Comboitem findListitemValue(Combobox listbox, ProgressType value) {
-        for (Object each : listbox.getChildren()) {
-            final Comboitem item = (Comboitem) each;
-            if (value.equals(item.getValue())) {
-                return item;
-            }
-        }
-        return null;
-    }
-
     public ProgressType getProgressTypeFromConfiguration() {
         return model.getProgressTypeFromConfiguration();
     }