X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fweb%2Fmvc%2Fexecution%2FListModulesDescriptors.java;h=f012fc2b12f236e81ab034d2c77e4d393c925234;hb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;hp=32cf1383ef40f929f855bc35d5a409d1e43f3489;hpb=4810532845c8a54c04a850c7db3a9fe00e8ebc6a;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 32cf1383e..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,42 +1,71 @@
+/*
+ * 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.ArrayList;
+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;
 
-import org.argeo.slc.execution.ExecutionModule;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
-import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.msg.ObjectList;
+import org.argeo.slc.runtime.SlcAgent;
+import org.argeo.slc.runtime.SlcAgentFactory;
 import org.argeo.slc.web.mvc.AbstractServiceController;
 import org.springframework.web.servlet.ModelAndView;
 
 /** . */
 public class ListModulesDescriptors extends AbstractServiceController {
-	private ExecutionModulesManager modulesManager;
+	private SlcAgentFactory agentFactory;
 
 	@Override
 	protected void handleServiceRequest(HttpServletRequest request,
 			HttpServletResponse response, ModelAndView modelAndView)
 			throws Exception {
 
-		List<ExecutionModule> modules = modulesManager.listExecutionModules();
+		// TODO: use centralized agentId property (from MsgConstants)?
+		String agentId = request.getParameter("agentId");
+
+		SlcAgent slcAgent = agentFactory.getAgent(agentId);
+
+		List<ExecutionModuleDescriptor> descriptors = slcAgent
+				.listExecutionModuleDescriptors();
+		SortedSet<ExecutionModuleDescriptor> set = new TreeSet<ExecutionModuleDescriptor>(
+				new Comparator<ExecutionModuleDescriptor>() {
 
-		List<ExecutionModuleDescriptor> descriptors = new ArrayList<ExecutionModuleDescriptor>();
-		for (ExecutionModule module : modules) {
-			ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
-			md.setName(module.getName());
-			md.setVersion(module.getVersion());
-			descriptors.add(md);
-		}
+					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 setModulesManager(ExecutionModulesManager modulesManager) {
-		this.modulesManager = modulesManager;
+	public void setAgentFactory(SlcAgentFactory agentFactory) {
+		this.agentFactory = agentFactory;
 	}
 
 }