From f8b92abb09e6461eeb08fc8da75d6836b47efa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 21 Oct 2009 23:40:23 +0200
Subject: [PATCH] ItEr31S12ValidacionEProbasFuncionaisItEr30S17: The order
 field was only being used by OrderLoadChartFiller so it is passed as a
 parameter

bug #66
---
 .../web/planner/OrderPlanningModel.java       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
index ea969400b..c39187743 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
@@ -90,9 +90,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
 
     private LocalDate maxDate;
 
-    private ILoadChartFiller loadChartFiller = new OrderLoadChartFiller();
-
-    private Order order;
+    private ILoadChartFiller loadChartFiller;
 
     private final class TaskElementNavigator implements
             IStructureNavigator<TaskElement> {
@@ -209,16 +207,14 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
 
     private void setupChart(Order orderReloaded, Timeplot chartComponent,
             TimeTracker timeTracker) {
-        this.order = orderReloaded;
+        loadChartFiller = new OrderLoadChartFiller(orderReloaded);
         loadChartFiller.fillChart(chartComponent, timeTracker
                 .getRealInterval(), timeTracker.getHorizontalSize());
-        fillChartOnZoomChange(orderReloaded, chartComponent, timeTracker);
+        fillChartOnZoomChange(chartComponent, timeTracker);
     }
 
-    private void fillChartOnZoomChange(final Order order,
-            final Timeplot chartComponent, final TimeTracker timeTracker) {
-        this.order = order;
-
+    private void fillChartOnZoomChange(final Timeplot chartComponent,
+            final TimeTracker timeTracker) {
         zoomListener = new IZoomLevelChangedListener() {
 
             @Override
@@ -433,12 +429,17 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
 
     private class OrderLoadChartFiller extends LoadChartFiller {
 
+        private final Order order;
+
+        public OrderLoadChartFiller(Order orderReloaded) {
+            this.order = orderReloaded;
+        }
+
         @Override
         public void fillChart(Timeplot chart, Interval interval, Integer size) {
             chart.getChildren().clear();
             chart.invalidate();
             resetMaximunValueForChart();
-
             Plotinfo plotInfoOrder = getLoadPlotInfo(order,
                     interval.getStart(), interval.getFinish());
             plotInfoOrder.setFillColor("0000FF");