X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrExecutionModulesView.java;h=3aa59d693f9aeba03d7838459a6f58908a27ee17;hb=0ddd1e8df3d2d5e5ee19912934c6d88757cd4f39;hp=f8cfab4c905fc3ed2b8edc08f8561ef156773c47;hpb=52311a31c8559c80c3189e2416b1e4a3d9cab3d2;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
index f8cfab4c9..3aa59d693 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,9 +41,8 @@ import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider;
 import org.argeo.eclipse.ui.jcr.NodeElementComparer;
 import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider;
 import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
-import org.argeo.slc.BasicNameVersion;
-import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.client.ui.editors.ProcessEditor;
 import org.argeo.slc.client.ui.editors.ProcessEditorInput;
@@ -51,10 +50,6 @@ import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.jcr.SlcJcrConstants;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -79,7 +74,8 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 	private final static Log log = LogFactory
 			.getLog(JcrExecutionModulesView.class);
 
-	public static final String ID = "org.argeo.slc.client.ui.jcrExecutionModulesView";
+	public static final String ID = ClientUiPlugin.ID
+			+ ".jcrExecutionModulesView";
 
 	private TreeViewer viewer;
 
@@ -140,20 +136,6 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 					new String[] { SlcJcrConstants.VM_AGENT_FACTORY_PATH });
 		}
 
-		// @Override
-		// protected Object[] getChildren(Node node) throws RepositoryException
-		// {
-		// if (node.isNodeType(SlcTypes.SLC_AGENT_FACTORY)) {
-		// List<AgentNodesWrapper> wrappers = new
-		// ArrayList<AgentNodesWrapper>();
-		// for (NodeIterator nit = node.getNodes(); nit.hasNext();) {
-		// wrappers.add(new AgentNodesWrapper(nit.nextNode()));
-		// }
-		// return wrappers.toArray();
-		// }
-		// return super.getChildren(node);
-		// }
-
 		@Override
 		protected Object[] sort(Object parent, Object[] children) {
 			Object[] sorted = new Object[children.length];
@@ -229,28 +211,6 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
 	}
 
-	// /** Wraps the execution modules of an agent. */
-	// static class AgentNodesWrapper extends NodesWrapper {
-	//
-	// public AgentNodesWrapper(Node node) {
-	// super(node);
-	// }
-	//
-	// protected List<WrappedNode> getWrappedNodes()
-	// throws RepositoryException {
-	// List<WrappedNode> children = new ArrayList<WrappedNode>();
-	// Node executionModules = getNode();
-	// for (NodeIterator nit = executionModules.getNodes(); nit.hasNext();) {
-	// for (NodeIterator nitVersions = nit.nextNode().getNodes(); nitVersions
-	// .hasNext();) {
-	// children.add(new WrappedNode(this, nitVersions.nextNode()));
-	// }
-	// }
-	// return children;
-	// }
-	//
-	// }
-
 	class VmAgentObserver extends AsyncUiEventListener {
 
 		public VmAgentObserver(Display display) {
@@ -274,13 +234,6 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 				}
 			}
 
-			// try {
-			// Node vmAgentNode = session
-			// .getNode(SlcJcrConstants.VM_AGENT_FACTORY_PATH);
-			// viewer.refresh(vmAgentNode);
-			// } catch (RepositoryException e) {
-			// log.warn("Cannot process event : " + e);
-			// }
 			// TODO: optimize based on event
 			viewer.refresh();
 		}
@@ -354,46 +307,8 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 				if (obj instanceof Node) {
 					Node node = (Node) obj;
 					if (node.isNodeType(SLC_EXECUTION_MODULE)) {
-						String name = node.getProperty(SLC_NAME).getString();
-						String version = node.getProperty(SLC_VERSION)
-								.getString();
-						final NameVersion nameVersion = new BasicNameVersion(
-								name, version);
-						Boolean started = node.getProperty(SLC_STARTED)
-								.getBoolean();
-
-						Job job;
-						if (started) {
-							job = new Job("Stop " + nameVersion) {
-								protected IStatus run(IProgressMonitor monitor) {
-									monitor.beginTask("Stop " + nameVersion, 1);
-									modulesManager.stop(nameVersion);
-									monitor.worked(1);
-									return Status.OK_STATUS;
-								}
-
-								protected void canceling() {
-									getThread().interrupt();
-									super.canceling();
-								}
-							};
-						} else {
-							job = new Job("Start " + nameVersion) {
-								protected IStatus run(IProgressMonitor monitor) {
-									monitor.beginTask("Start " + nameVersion, 1);
-									modulesManager.start(nameVersion);
-									monitor.worked(1);
-									return Status.OK_STATUS;
-								}
-
-								protected void canceling() {
-									getThread().interrupt();
-									super.canceling();
-								}
-							};
-						}
-						job.setUser(true);
-						job.schedule();
+						ClientUiPlugin.startStopExecutionModule(modulesManager,
+								node);
 					} else {
 						String path = node.getPath();
 						// TODO factorize with editor
@@ -413,8 +328,6 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 							paths.add(nit.nextNode().getPath());
 						}
 
-						// List<String> paths = new ArrayList<String>();
-						// paths.add(node.getPath());
 						IWorkbenchPage activePage = PlatformUI.getWorkbench()
 								.getActiveWorkbenchWindow().getActivePage();
 						activePage.openEditor(new ProcessEditorInput(