From 2ead73273fe5526c8b38a3508e9723da1661f582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Fri, 5 Aug 2011 19:00:31 +0200
Subject: [PATCH] Create fields instead of implicitly passing the data

FEA: ItEr75S11PreventLooseChanges
---
 .../resourceload/ResourcesLoadPanel.java      | 24 +++++++++++++++++--
 .../resourceload/ResourceLoadController.java  |  6 ++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
index d58b7fce7..fbb6dbdcd 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
@@ -109,6 +109,10 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
 
     private final boolean expandResourceLoadViewCharts;
 
+    private Component firstOptionalFilter;
+
+    private Component secondOptionalFilter;
+
     public ResourcesLoadPanel(List<LoadTimeLine> groups,
             TimeTracker timeTracker, Component componentOnWhichGiveFeedback,
             boolean expandResourceLoadViewCharts, PaginationType paginationType) {
@@ -345,11 +349,11 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
         getFellow("insertionPointTimetracker").appendChild(timeTrackerHeader);
 
         // Insert additional filters if any
-        Component additionalFilter = (Component) getVariable("additionalFilter1", true);
+        Component additionalFilter = getFirstOptionalFilter();
         if(additionalFilter != null) {
             getFellow("additionalFilterInsertionPoint1").appendChild(additionalFilter);
         }
-        additionalFilter = (Component) getVariable("additionalFilter2", true);
+        additionalFilter = getSecondOptionalFilter();
         if(additionalFilter != null) {
             getFellow("additionalFilterInsertionPoint2").appendChild(additionalFilter);
         }
@@ -374,6 +378,22 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
         savePreviousData();
     }
 
+    public Component getFirstOptionalFilter() {
+        return firstOptionalFilter;
+    }
+
+    public void setFirstOptionalFilter(Component firstOptionalFilter) {
+        this.firstOptionalFilter = firstOptionalFilter;
+    }
+
+    public Component getSecondOptionalFilter() {
+        return secondOptionalFilter;
+    }
+
+    public void setSecondOptionalFilter(Component secondOptionalFilter) {
+        this.secondOptionalFilter = secondOptionalFilter;
+    }
+
     public void clearComponents() {
         getFellow("insertionPointLeftPanel").getChildren().clear();
         getFellow("insertionPointRightPanel").getChildren().clear();
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 ea4760241..4f328bff7 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
@@ -344,8 +344,7 @@ public class ResourceLoadController implements Composer {
         hbox.appendChild(bandBox);
         hbox.appendChild(button);
         hbox.setAlign("center");
-
-        resourcesLoadPanel.setVariable("additionalFilter2", hbox, true);
+        resourcesLoadPanel.setSecondOptionalFilter(hbox);
     }
 
     private void addTimeFilter() {
@@ -379,8 +378,7 @@ public class ResourceLoadController implements Composer {
         hbox.appendChild(label2);
         hbox.appendChild(endDate);
         hbox.setAlign("center");
-
-        resourcesLoadPanel.setVariable("additionalFilter1", hbox, true);
+        resourcesLoadPanel.setFirstOptionalFilter(hbox);
     }
 
     private void setupNameFilter() {