X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrExecutionModulesView.java;h=75864680e0a8970efac4567b90dbdc1994d49c45;hb=eef4888d3214ab92c5df3768d08c3e26269cc429;hp=490a1c31d26ace5f510bbf30006a9a85ef71b777;hpb=0e5c4db299f1d74541d4c55283379513a7e10af5;p=gpl%2Fargeo-slc.git

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
index 490a1c31d..75864680e 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
@@ -5,14 +5,19 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.jcr.Node;
+import javax.jcr.NodeIterator;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.observation.Event;
 import javax.jcr.observation.EventIterator;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
 
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
@@ -28,7 +33,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.jface.viewers.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -42,6 +46,7 @@ import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
@@ -62,7 +67,9 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
 	public void createPartControl(Composite parent) {
 		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		ColumnViewerToolTipSupport.enableFor(viewer);
+
+		// FIXME : does not work in RAP, find a way to have it for RCP only
+		// ColumnViewerToolTipSupport.enableFor(viewer);
 
 		ViewContentProvider contentProvider = new ViewContentProvider(session);
 
@@ -82,7 +89,7 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 			session.getWorkspace()
 					.getObservationManager()
 					.addEventListener(
-							new VmAgentObserver(),
+							new VmAgentObserver(viewer.getTree().getDisplay()),
 							Event.NODE_ADDED | Event.NODE_REMOVED
 									| Event.NODE_MOVED,
 							SlcJcrConstants.VM_AGENT_FACTORY_PATH, true, null,
@@ -223,6 +230,11 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 	// }
 
 	class VmAgentObserver extends AsyncUiEventListener {
+
+		public VmAgentObserver(Display display) {
+			super(display);
+		}
+
 		protected void onEventInUiThread(EventIterator events) {
 			// List<Node> baseNodes = ((SimpleNodeContentProvider) viewer
 			// .getContentProvider()).getBaseNodes();
@@ -333,14 +345,7 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 			try {
 				if (obj instanceof Node) {
 					Node node = (Node) obj;
-					if (node.isNodeType(SLC_EXECUTION_FLOW)) {
-						List<String> paths = new ArrayList<String>();
-						paths.add(node.getPath());
-						IWorkbenchPage activePage = PlatformUI.getWorkbench()
-								.getActiveWorkbenchWindow().getActivePage();
-						activePage.openEditor(new ProcessEditorInput(paths,
-								true), ProcessEditor.ID);
-					} else if (node.isNodeType(SLC_EXECUTION_MODULE)) {
+					if (node.isNodeType(SLC_EXECUTION_MODULE)) {
 						String name = node.getProperty(SLC_NAME).getString();
 						String version = node.getProperty(SLC_VERSION)
 								.getString();
@@ -353,6 +358,32 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 						} else {
 							modulesManager.start(nameVersion);
 						}
+					} else {
+						String path = node.getPath();
+						// TODO factorize with editor
+						QueryManager qm = node.getSession().getWorkspace()
+								.getQueryManager();
+						String statement = "SELECT * FROM ["
+								+ SlcTypes.SLC_EXECUTION_FLOW
+								+ "] WHERE ISDESCENDANTNODE(['" + path
+								+ "']) OR ISSAMENODE(['" + path + "'])";
+						// log.debug(statement);
+						Query query = qm.createQuery(statement, Query.JCR_SQL2);
+
+						// order paths
+						SortedSet<String> paths = new TreeSet<String>();
+						for (NodeIterator nit = query.execute().getNodes(); nit
+								.hasNext();) {
+							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(
+								new ArrayList<String>(paths), true),
+								ProcessEditor.ID);
 					}
 				}
 			} catch (Exception e) {