From ea1431c141d0ae43a493867abcaca1f9e7e86cdd Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Wed, 23 Sep 2009 16:33:53 +0200
Subject: [PATCH]  ItEr27S11AltaEtiquetasTipoEtiquetaItEr26S13: Added order by
 name to list Labels

---
 .../org/navalplanner/web/labels/ILabelTypeModel.java |  3 +--
 .../web/labels/LabelTypeCRUDController.java          |  3 +--
 .../org/navalplanner/web/labels/LabelTypeModel.java  | 12 +++++++-----
 .../src/main/webapp/labels/_editLabelType.zul        |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/ILabelTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/ILabelTypeModel.java
index 45f0c88cc..2fc025f78 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/ILabelTypeModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/ILabelTypeModel.java
@@ -1,7 +1,6 @@
 package org.navalplanner.web.labels;
 
 import java.util.List;
-import java.util.Set;
 
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.labels.entities.Label;
@@ -55,7 +54,7 @@ public interface ILabelTypeModel {
      *
      * @return
      */
-    Set<Label> getLabels();
+    List<Label> getLabels();
 
     /**
      * Add {@link Label} to {@link LabelType}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
index 6d3052c60..aa4fa8ee6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
@@ -3,7 +3,6 @@ package org.navalplanner.web.labels;
 import static org.navalplanner.web.I18nHelper._;
 
 import java.util.List;
-import java.util.Set;
 
 import org.hibernate.validator.InvalidValue;
 import org.navalplanner.business.common.exceptions.ValidationException;
@@ -98,7 +97,7 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
         return labelTypeModel.getLabelType();
     }
 
-    public Set<Label> getLabels() {
+    public List<Label> getLabels() {
         return labelTypeModel.getLabels();
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java
index 00e4e38d6..ca34a3bb6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java
@@ -4,9 +4,7 @@ import static org.navalplanner.web.I18nHelper._;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.commons.lang.Validate;
 import org.hibernate.validator.ClassValidator;
@@ -199,9 +197,13 @@ public class LabelTypeModel implements ILabelTypeModel {
 
     @Override
     @Transactional(readOnly = true)
-    public Set<Label> getLabels() {
-        return (labelType != null) ? labelType.getLabels()
-                : new HashSet<Label>();
+    public List<Label> getLabels() {
+        // Safe copy
+        List<Label> labels = new ArrayList<Label>();
+        if (labelType != null) {
+            labels.addAll(labelType.getLabels());
+        }
+        return labels;
     }
 
     @Override
diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index 4a37b68d7..29a9406f9 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -26,7 +26,7 @@
             <grid id="gridLabels" height="320px"
                 model="@{controller.labels}">
                  <columns sizable="true">
-                     <column label="${i18n:_('Name')}" />
+                     <column label="${i18n:_('Name')}" sort="auto(name)" />
                      <column label="${i18n:_('Operations')}" />
                  </columns>
                  <rows>