From 000f701dc68da09bc5616f7913159f57d3540bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Wed, 9 Mar 2011 15:09:43 +0100
Subject: [PATCH] [Bug #901] Fixed showing limiting resources queues ordered
 alphabetically

FEA: ItEr72S04BugFixing
---
 .../LimitingResourceQueueModel.java           |  3 +-
 .../web/limitingresources/QueuesState.java    | 28 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 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 53dfd8f24..694b5b998 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
@@ -406,7 +406,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
 
     @Override
     public List<LimitingResourceQueue> getLimitingResourceQueues() {
-        return queuesState.getQueues();
+        return queuesState.getQueuesOrderedByResourceName();
     }
 
     @Override
@@ -414,6 +414,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
         return queuesState.getUnassigned();
     }
 
+    @Override
     public ZoomLevel calculateInitialZoomLevel() {
         Interval interval = getViewInterval();
         return ZoomLevel.getDefaultZoomByDates(new LocalDate(interval
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueuesState.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueuesState.java
index 5bee98421..1de42a384 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueuesState.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueuesState.java
@@ -23,6 +23,7 @@ package org.navalplanner.web.limitingresources;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -51,8 +52,6 @@ import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueue
 import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency.QueueDependencyType;
 import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.entities.Criterion;
-import org.navalplanner.business.resources.entities.CriterionCompounder;
-import org.navalplanner.business.resources.entities.ICriterion;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.resources.entities.ResourceEnum;
@@ -163,6 +162,31 @@ public class QueuesState {
         return Collections.unmodifiableList(queues);
     }
 
+    public ArrayList<LimitingResourceQueue> getQueuesOrderedByResourceName() {
+        ArrayList<LimitingResourceQueue> result = new ArrayList<LimitingResourceQueue>(
+                queues);
+        Collections.sort(result, new Comparator<LimitingResourceQueue>() {
+
+            @Override
+            public int compare(LimitingResourceQueue arg0,
+                    LimitingResourceQueue arg1) {
+
+                if ((arg0 == null) || (arg0.getResource().getName() == null)) {
+                    return -1;
+                }
+
+                if ((arg1 == null) || (arg1.getResource().getName() == null)) {
+                    return 1;
+                }
+                return (arg0.getResource().getName().toLowerCase()
+                        .compareTo(arg1.getResource().getName().toLowerCase()));
+            }
+
+        });
+        return result;
+
+    }
+
     public List<LimitingResourceQueueElement> getUnassigned() {
         return Collections.unmodifiableList(unassignedElements);
     }