X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fweb%2Fmvc%2Fexecution%2FListModulesDescriptors.java;h=f012fc2b12f236e81ab034d2c77e4d393c925234;hb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;hp=b9b210b568bf2920a852cc0e2479bb53a3717526;hpb=cebfbf8efbf6a6b99a543bd309d2976478123989;p=gpl%2Fargeo-slc.git

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 b9b210b56..f012fc2b1 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,25 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 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;
@@ -21,12 +40,28 @@ public class ListModulesDescriptors extends AbstractServiceController {
 			HttpServletResponse response, ModelAndView modelAndView)
 			throws Exception {
 
+		// TODO: use centralized agentId property (from MsgConstants)?
 		String agentId = request.getParameter("agentId");
+
 		SlcAgent slcAgent = agentFactory.getAgent(agentId);
 
-		List<ExecutionModuleDescriptor> descriptors = slcAgent.listExecutionModuleDescriptors();
+		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(descriptors));
+		modelAndView.addObject(new ObjectList(set));
 	}
 
 	public void setAgentFactory(SlcAgentFactory agentFactory) {