]> git.argeo.org Git - gpl/argeo-slc.git/blobdiff - eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
Improve JCR data model
[gpl/argeo-slc.git] / eclipse / plugins / org.argeo.slc.client.ui / src / main / java / org / argeo / slc / client / ui / views / JcrExecutionModulesView.java
index 210ac342872271793ea2c21f7ba927b1f53c4efc..59157a3702bfb5a6d3fab4ebe3364786603a5b5d 100644 (file)
@@ -1,40 +1,29 @@
 package org.argeo.slc.client.ui.views;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Properties;
-import java.util.UUID;
 
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
+import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.observation.Event;
 import javax.jcr.observation.EventIterator;
-import javax.jcr.observation.EventListener;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
+import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider;
-import org.argeo.eclipse.ui.jcr.NodesWrapper;
 import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider;
-import org.argeo.eclipse.ui.jcr.WrappedNode;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.client.ui.ClientUiPlugin;
-import org.argeo.slc.client.ui.controllers.ProcessController;
-import org.argeo.slc.client.ui.providers.ExecutionModulesContentProvider;
-import org.argeo.slc.client.ui.providers.ExecutionModulesContentProvider.FlowNode;
+import org.argeo.slc.client.ui.SlcImages;
+import org.argeo.slc.client.ui.editors.ProcessEditor;
+import org.argeo.slc.client.ui.editors.ProcessEditorInput;
 import org.argeo.slc.jcr.SlcJcrConstants;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
-import org.argeo.slc.process.RealizedFlow;
-import org.argeo.slc.process.SlcExecution;
+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,18 +31,21 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DragSourceAdapter;
 import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DragSourceListener;
 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.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
 
+/** JCR based view of the execution modules. */
 public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
                SlcNames {
-       private final static Log log = LogFactory
-                       .getLog(JcrExecutionModulesView.class);
+       // private final static Log log = LogFactory
+       // .getLog(JcrExecutionModulesView.class);
 
        public static final String ID = "org.argeo.slc.client.ui.jcrExecutionModulesView";
 
@@ -61,19 +53,21 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
        private Session session;
 
-       private ProcessController processController;
-
        public void createPartControl(Composite parent) {
                viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+               ColumnViewerToolTipSupport.enableFor(viewer);
 
                ViewContentProvider contentProvider = new ViewContentProvider(session);
 
                viewer.setContentProvider(contentProvider);
-               viewer.setLabelProvider(new ViewLabelProvider());
+               final ViewLabelProvider viewLabelProvider = new ViewLabelProvider();
+               viewer.setLabelProvider(viewLabelProvider);
                viewer.setInput(getViewSite());
                viewer.addDoubleClickListener(new ViewDoubleClickListener());
-               int operations = DND.DROP_COPY | DND.DROP_MOVE;
+
                Transfer[] tt = new Transfer[] { TextTransfer.getInstance() };
+               // Transfer[] tt = new Transfer[] { EditorInputTransfer.getInstance() };
+               int operations = DND.DROP_COPY | DND.DROP_MOVE;
                viewer.addDragSupport(operations, tt, new ViewDragListener());
 
                try {
@@ -109,17 +103,17 @@ 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_PROXY)) {
-                               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[] 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) {
@@ -160,35 +154,32 @@ 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().getNode(
-                                       SlcNames.SLC_EXECUTION_MODULES);
-                       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 implements EventListener {
-
-               public void onEvent(EventIterator events) {
+//     /** 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 {
+               protected void onEventInUiThread(EventIterator events) {
                        viewer.refresh();
                }
-
        }
 
        class ViewLabelProvider extends DefaultNodeLabelProvider implements
@@ -202,120 +193,82 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
                }
 
                public Image getImage(Node node) throws RepositoryException {
-                       if (node.getParent().isNodeType(SlcTypes.SLC_AGENT_PROXY))
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("agent");
+                       if (node.isNodeType(SlcTypes.SLC_AGENT))
+                               return SlcImages.AGENT;
                        else if (node.isNodeType(SlcTypes.SLC_MODULE))
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("executionModule");
+                               return SlcImages.MODULE;
                        else if (node.isNodeType(SlcTypes.SLC_EXECUTION_FLOW))
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("flow");
+                               return SlcImages.FLOW;
                        else
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("folder");
+                               return SlcImages.FOLDER;
+               }
+
+               public String getToolTipText(Node node) throws RepositoryException {
+                       if (node.isNodeType(SlcTypes.SLC_MODULE)
+                                       && node.hasProperty(Property.JCR_DESCRIPTION))
+                               return node.getProperty(Property.JCR_DESCRIPTION).getString();
+                       return super.getToolTipText(node);
                }
+
        }
 
        class ViewDoubleClickListener implements IDoubleClickListener {
                public void doubleClick(DoubleClickEvent evt) {
                        Object obj = ((IStructuredSelection) evt.getSelection())
                                        .getFirstElement();
-                       if (obj instanceof ExecutionModulesContentProvider.FlowNode) {
-                               ExecutionModulesContentProvider.FlowNode fn = (ExecutionModulesContentProvider.FlowNode) obj;
-
-                               List<RealizedFlow> realizedFlows = new ArrayList<RealizedFlow>();
-                               RealizedFlow realizedFlow = new RealizedFlow();
-                               realizedFlow.setModuleName(fn.getExecutionModuleNode()
-                                               .getDescriptor().getName());
-                               realizedFlow.setModuleVersion(fn.getExecutionModuleNode()
-                                               .getDescriptor().getVersion());
-                               realizedFlow.setFlowDescriptor(fn.getExecutionModuleNode()
-                                               .getFlowDescriptors().get(fn.getFlowName()));
-                               realizedFlows.add(realizedFlow);
-
-                               SlcExecution slcExecution = new SlcExecution();
-                               slcExecution.setUuid(UUID.randomUUID().toString());
-                               slcExecution.setRealizedFlows(realizedFlows);
-                               slcExecution.setHost(fn.getExecutionModuleNode().getAgentNode()
-                                               .getAgent().toString());
-                               processController.execute(fn.getExecutionModuleNode()
-                                               .getAgentNode().getAgent(), slcExecution);
+                       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);
+                                       }
+                               }
+                       } catch (Exception e) {
+                               throw new SlcException("Cannot open " + obj, e);
                        }
                }
 
        }
 
-       class ViewDragListener implements DragSourceListener {
-
-               public void dragStart(DragSourceEvent event) {
-                       System.out.println("Start Drag");
-               }
-
+       class ViewDragListener extends DragSourceAdapter {
                public void dragSetData(DragSourceEvent event) {
-
-                       // System.out.println("dragSetData: " + event);
-
                        IStructuredSelection selection = (IStructuredSelection) viewer
                                        .getSelection();
-                       if (selection.getFirstElement() instanceof ExecutionModulesContentProvider.FlowNode) {
+                       if (selection.getFirstElement() instanceof Node) {
+                               Node node = (Node) selection.getFirstElement();
+                               // try {
+                               // if (node.isNodeType(SLC_EXECUTION_FLOW)) {
+                               // if (EditorInputTransfer.getInstance().isSupportedType(
+                               // event.dataType)) {
+                               // ProcessEditorInput pei = new ProcessEditorInput(
+                               // node.getPath());
+                               // EditorInputData eid = EditorInputTransfer
+                               // .createEditorInputData(ProcessEditor.ID,
+                               // pei);
+                               // event.data = new EditorInputTransfer.EditorInputData[] { eid
+                               // };
+                               //
+                               // }
+                               // }
+                               // } catch (RepositoryException e1) {
+                               // throw new SlcException("Cannot drag " + node, e1);
+                               // }
 
                                if (TextTransfer.getInstance().isSupportedType(event.dataType)) {
-                                       ExecutionModulesContentProvider.FlowNode flowNode = (ExecutionModulesContentProvider.FlowNode) selection
-                                                       .getFirstElement();
-
-                                       Properties props = new Properties();
-                                       flowNodeAsProperties(props, flowNode);
-                                       props.setProperty("agentId", flowNode
-                                                       .getExecutionModuleNode().getAgentNode().getAgent()
-                                                       .getAgentUuid());
-                                       props.setProperty("host", flowNode.getExecutionModuleNode()
-                                                       .getAgentNode().getAgent().toString());
-
-                                       ByteArrayOutputStream out = new ByteArrayOutputStream();
                                        try {
-                                               props.store(out, "");
-                                               event.data = new String(out.toByteArray());
-                                       } catch (IOException e) {
-                                               throw new SlcException(
-                                                               "Cannot transform realized flow", e);
-                                       } finally {
-                                               IOUtils.closeQuietly(out);
+                                               event.data = node.getPath();
+                                       } catch (RepositoryException e1) {
+                                               // TODO Auto-generated catch block
+                                               e1.printStackTrace();
                                        }
                                }
                        }
                }
-
-               public void dragFinished(DragSourceEvent event) {
-                       System.out.println("Finished Drag");
-               }
-
-               protected void flowNodeAsProperties(Properties props, FlowNode fn) {
-
-                       RealizedFlow realizedFlow = new RealizedFlow();
-                       realizedFlow.setModuleName(fn.getExecutionModuleNode()
-                                       .getDescriptor().getName());
-                       realizedFlow.setModuleVersion(fn.getExecutionModuleNode()
-                                       .getDescriptor().getVersion());
-                       realizedFlow.setFlowDescriptor(fn.getExecutionFlowDescriptor());
-
-                       // As we want to have the effective ExecutionSpec and not a
-                       // reference; we store it at the RealizeFlow level : thus the
-                       // marshaller will store the object and not only a reference.
-                       realizedFlow.setExecutionSpec(fn.getExecutionFlowDescriptor()
-                                       .getExecutionSpec());
-
-                       // props.setProperty("RealizedFlowAsXml",
-                       // oxmBean.marshal(realizedFlow));
-                       // System.out
-                       // .println(oxmBean.marshal(fn.getExecutionFlowDescriptor()));
-
-               }
-
-       }
-
-       public void setProcessController(ProcessController processController) {
-               this.processController = processController;
        }
 
        public void setSession(Session session) {