From c3d2bc2d3778338d9ddc121f97b2e472c7d8d57f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 26 Aug 2010 20:11:40 +0200
Subject: [PATCH] Avoid adding Timeplot because it is failing.

The exception produced is:
org.zkoss.zk.ui.UiException: Widget class required for <Timeplot z_d__87> with default
at org.zkoss.zk.ui.AbstractComponent.redraw(AbstractComponent.java:1681)

The root cause is that timeplotz lang-addon.xml file is not loaded due
to a version missmatch. From startup log:

Aug 26, 2010 8:21:27 PM org.zkoss.zk.ui.sys.ConfigParser checkVersion:120
INFO: Ignore jar:file:/home/ogonzalez/.m2/repository/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar!/metainfo/zk/lang-addon.xml
Cause: version not matched; expected=1.1_50-FL, xml=1.1_50

FEA: ItEr02S03MigracionZK5
---
 .../web/planner/company/CompanyPlanningModel.java          | 5 +++--
 .../navalplanner/web/planner/order/OrderPlanningModel.java | 5 +++--
 .../web/resourceload/ResourceLoadController.java           | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
index 97826cfc9..c29cb2428 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
@@ -308,8 +308,9 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
         CompanyEarnedValueChartFiller earnedValueChartFiller = new CompanyEarnedValueChartFiller();
         earnedValueChartFiller.calculateValues(planner.getTimeTracker()
                 .getRealInterval());
-        appendTabpanels(chartComponent, chartLoadTimeplot,
-                chartEarnedValueTimeplot, earnedValueChartFiller);
+        // avoid adding Timeplot since it has some pending issues
+        // appendTabpanels(chartComponent, chartLoadTimeplot,
+        // chartEarnedValueTimeplot, earnedValueChartFiller);
 
         setupChart(chartLoadTimeplot, new CompanyLoadChartFiller(), planner);
         Chart earnedValueChart = setupChart(chartEarnedValueTimeplot,
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index f55485ccc..29f34d45f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -373,8 +373,9 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
                 orderReloaded);
         earnedValueChartFiller.calculateValues(planner.getTimeTracker()
                 .getRealInterval());
-        appendTabpanels(chartComponent, chartLoadTimeplot,
-                chartEarnedValueTimeplot, earnedValueChartFiller);
+        // avoid adding Timeplot since it has some pending issues
+        // appendTabpanels(chartComponent, chartLoadTimeplot,
+        // chartEarnedValueTimeplot, earnedValueChartFiller);
 
         Chart loadChart = setupChart(orderReloaded, new OrderLoadChartFiller(
                 orderReloaded), chartLoadTimeplot, planner);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
index 65f87cecf..88442ec13 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
@@ -29,10 +29,10 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.Map.Entry;
 
 import org.apache.commons.lang.Validate;
 import org.joda.time.LocalDate;
@@ -515,8 +515,9 @@ public class ResourceLoadController implements Composer {
 
         Tabpanels chartTabpanels = new Tabpanels();
         Tabpanel loadChartPannel = new Tabpanel();
-        CompanyPlanningModel.appendLoadChartAndLegend(loadChartPannel,
-                buildLoadChart());
+        // avoid adding Timeplot since it has some pending issues
+        // CompanyPlanningModel.appendLoadChartAndLegend(loadChartPannel,
+        // buildLoadChart());
         chartTabpanels.appendChild(loadChartPannel);
         chartComponent.appendChild(chartTabpanels);