From 885b7d656756544be098030e7055351023fa0eb4 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 30 Jul 2009 16:32:51 +0000 Subject: [PATCH] Order modules by name git-svn-id: https://svn.argeo.org/slc/trunk@2840 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../mvc/execution/ListModulesDescriptors.java | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) 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 descriptors = slcAgent.listExecutionModuleDescriptors(); + SlcAgent slcAgent = agentFactory.getAgent(agentId); - modelAndView.addObject(new ObjectList(descriptors)); + List descriptors = slcAgent + .listExecutionModuleDescriptors(); + SortedSet set = new TreeSet( + new Comparator() { + + 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) { -- 2.39.5