From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 30 Jul 2009 16:32:51 +0000 (+0000)
Subject: Order modules by name
X-Git-Tag: argeo-slc-2.1.7~1574
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=885b7d656756544be098030e7055351023fa0eb4;p=gpl%2Fargeo-slc.git

Order modules by name

git-svn-id: https://svn.argeo.org/slc/trunk@2840 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java
index 392e46ebc..65637246b 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java
@@ -1,6 +1,9 @@
 package org.argeo.slc.web.mvc.execution;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -23,12 +26,26 @@ public class ListModulesDescriptors extends AbstractServiceController {
 
 		// TODO: use centralized agentId property (from MsgConstants)?
 		String agentId = request.getParameter("agentId");
-		
-		SlcAgent slcAgent = agentFactory.getAgent(agentId);
 
-		List<ExecutionModuleDescriptor> descriptors = slcAgent.listExecutionModuleDescriptors();
+		SlcAgent slcAgent = agentFactory.getAgent(agentId);
 
-		modelAndView.addObject(new ObjectList(descriptors));
+		List<ExecutionModuleDescriptor> descriptors = slcAgent
+				.listExecutionModuleDescriptors();
+		SortedSet<ExecutionModuleDescriptor> set = new TreeSet<ExecutionModuleDescriptor>(
+				new Comparator<ExecutionModuleDescriptor>() {
+
+					public int compare(ExecutionModuleDescriptor md1,
+							ExecutionModuleDescriptor md2) {
+						String str1 = md1.getLabel() != null ? md1.getLabel()
+								: md1.getName();
+						String str2 = md2.getLabel() != null ? md2.getLabel()
+								: md2.getName();
+						return str1.compareTo(str2);
+					}
+				});
+		set.addAll(descriptors);
+
+		modelAndView.addObject(new ObjectList(set));
 	}
 
 	public void setAgentFactory(SlcAgentFactory agentFactory) {