From 87b9b7c0d5b84a571ffc2baa0c4ed33d160e0307 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Mon, 26 Apr 2010 09:45:19 +0200
Subject: [PATCH]  ItEr55S11RFAspectosGraficosRecursoLimitantesItEr54S12:
 Created LimitingResource Model

---
 .../LimitingResourceQueueModel.java             |  5 ++---
 .../LimitingResourcesController.java            | 17 +++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
index 4a915c17e..4936c6154 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
@@ -194,7 +194,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
         if (filter()) {
             return resourcesForActiveTasks();
         } else {
-            return allResources();
+            return allLimitingResources();
         }
     }
 
@@ -218,8 +218,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
         return result;
     }
 
-    private List<Resource> allResources() {
-        // return Resource.sortByName(resourcesDAO.list(Resource.class));
+    private List<Resource> allLimitingResources() {
         return Resource.sortByName(resourcesDAO.getAllLimitingResources());
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
index 13e42d3ac..e81303cb1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
@@ -29,7 +29,6 @@ import java.util.List;
 import org.apache.commons.lang.Validate;
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.web.planner.order.BankHolidaysMarker;
-import org.navalplanner.web.resourceload.IResourceLoadModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
@@ -43,7 +42,7 @@ import org.zkoss.zk.ui.util.Composer;
 import org.zkoss.zul.Messagebox;
 
 /**
- * Controller for global limitingresources view
+ * Controller for limiting resources view
  * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 @Component
@@ -51,7 +50,7 @@ import org.zkoss.zul.Messagebox;
 public class LimitingResourcesController implements Composer {
 
     @Autowired
-    private IResourceLoadModel resourceLoadModel;
+    private ILimitingResourceQueueModel limitingResourceQueueModel;
 
     private List<IToolbarCommand> commands = new ArrayList<IToolbarCommand>();
 
@@ -88,9 +87,10 @@ public class LimitingResourcesController implements Composer {
     private void reload(boolean filterByResources) {
         try {
             if (filterBy == null) {
-                resourceLoadModel.initGlobalView(filterByResources);
+                limitingResourceQueueModel.initGlobalView(filterByResources);
             } else {
-                resourceLoadModel.initGlobalView(filterBy, filterByResources);
+                limitingResourceQueueModel.initGlobalView(filterBy,
+                        filterByResources);
             }
             timeTracker = buildTimeTracker();
             limitingResourcesPanel = buildLimitingResourcesPanel();
@@ -131,14 +131,15 @@ public class LimitingResourcesController implements Composer {
     }
 
     private TimeTracker buildTimeTracker() {
-        return timeTracker = new TimeTracker(resourceLoadModel
-                .getViewInterval(), resourceLoadModel
+        return timeTracker = new TimeTracker(limitingResourceQueueModel
+                .getViewInterval(), limitingResourceQueueModel
                 .calculateInitialZoomLevel(), SeveralModificators.create(),
                 SeveralModificators.create(new BankHolidaysMarker()), parent);
     }
 
     private LimitingResourcesPanel buildLimitingResourcesPanel() {
-        return new LimitingResourcesPanel(resourceLoadModel.getLoadTimeLines(),
+        return new LimitingResourcesPanel(limitingResourceQueueModel
+                .getLoadTimeLines(),
                 timeTracker);
     }