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%2Feditors%2FProcessBuilderPage.java;h=28c2f69c611a6bd485256a70f055f1759a5cc287;hb=f48476cba243066d5797b8073c15d6ab6842eb6a;hp=6b6fed542111422db7d9b34db36c327b5e374f6b;hpb=86c47402780f41526382267ff1597d2f3a0d0dd7;p=gpl%2Fargeo-slc.git diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java index 6b6fed542..28c2f69c6 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java +++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java @@ -3,23 +3,20 @@ package org.argeo.slc.client.ui.editors; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.UUID; +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.observation.EventListener; import javax.jcr.observation.ObservationManager; import javax.jcr.query.Query; import javax.jcr.query.QueryManager; -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.jcr.JcrUtils; @@ -64,17 +61,17 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.forms.AbstractFormPart; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.editor.FormPage; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.ScrolledForm; +/** Definition of the process. */ public class ProcessBuilderPage extends FormPage implements SlcNames { public final static String ID = "processBuilderPage"; - private final static Log log = LogFactory.getLog(ProcessBuilderPage.class); + // private final static Log log = + // LogFactory.getLog(ProcessBuilderPage.class); private Node processNode; @@ -113,8 +110,8 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { getManagedForm().addPart(formPart); // observation - statusObserver = new AsyncUiEventListener() { - protected void onEventInUiThread(EventIterator events) { + statusObserver = new AsyncUiEventListener(form.getDisplay()) { + protected void onEventInUiThread(List events) { statusChanged(); } }; @@ -124,6 +121,9 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { Event.PROPERTY_CHANGED, processNode.getPath(), true, null, null, false); + // make sure all controls are in line with status + statusChanged(); + // add initial flows addInitialFlows(); @@ -145,7 +145,9 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { run.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { if (isFinished(getProcessStatus())) { - relaunch(); + ((ProcessEditor) getEditor()).relaunch(); + } else if (isRunning(getProcessStatus())) { + ((ProcessEditor) getEditor()).kill(); } else { ((ProcessEditor) getEditor()).process(); } @@ -190,8 +192,6 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { statusComposite.setLayout(new FillLayout()); statusLabel = tk.createLabel(statusComposite, getProcessStatus()); - // make sure all controls are in line with status - statusChanged(); } protected void createBuilder(Composite parent) { @@ -278,59 +278,27 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { /* * CONTROLLERS */ - /** Opens a new editor with a copy of this process */ - protected void relaunch() { - try { - Node duplicatedNode = duplicateProcess(); - IWorkbenchPage activePage = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(); - activePage.openEditor( - new ProcessEditorInput(duplicatedNode.getPath()), - ProcessEditor.ID); - getEditor().close(false); - } catch (Exception e1) { - throw new SlcException("Cannot relaunch " + processNode, e1); - } - } - - /** Duplicates the process */ - protected Node duplicateProcess() { - try { - Session session = processNode.getSession(); - String uuid = UUID.randomUUID().toString(); - String destPath = SlcJcrUtils.createExecutionProcessPath(uuid); - Node newNode = JcrUtils.mkdirs(session, destPath, - SlcTypes.SLC_PROCESS); - JcrUtils.copy(processNode, newNode); - // session.getWorkspace().copy(processNode.getPath(), destPath); - // Node newNode = session.getNode(destPath); - // make sure that we kept the mixins - // newNode.addMixin(NodeType.MIX_CREATED); - // newNode.addMixin(NodeType.MIX_LAST_MODIFIED); - newNode.setProperty(SLC_UUID, uuid); - newNode.setProperty(SLC_STATUS, ExecutionProcess.INITIALIZED); - session.save(); - return newNode; - } catch (RepositoryException e) { - throw new SlcException("Cannot duplicate process", e); - } - } - /** Reflects a status change */ protected void statusChanged() { String status = getProcessStatus(); statusLabel.setText(status); Boolean isEditable = isEditable(status); - run.setEnabled(isEditable); + run.setEnabled(status.equals(ExecutionProcess.RUNNING) || isEditable); remove.setEnabled(isEditable); clear.setEnabled(isEditable); // flowsViewer.getTree().setEnabled(isEditable); - if (status.equals(ExecutionProcess.COMPLETED) - || status.equals(ExecutionProcess.ERROR)) { + if (status.equals(ExecutionProcess.RUNNING)) { + run.setEnabled(true); + run.setImage(SlcImages.KILL); + run.setToolTipText("Kill"); + } else if (isFinished(status)) { run.setEnabled(true); run.setImage(SlcImages.RELAUNCH); run.setToolTipText("Relaunch"); } + + if (flowsViewer != null) + flowsViewer.refresh(); } /** Adds initial flows from the editor input if any */ @@ -372,6 +340,7 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { specAttrs: for (NodeIterator nit = specAttrsBase.getNodes(); nit .hasNext();) { Node specAttrNode = nit.nextNode(); + String attrName = specAttrNode.getName(); if (!specAttrNode .isNodeType(SlcTypes.SLC_EXECUTION_SPEC_ATTRIBUTE)) continue specAttrs; @@ -379,13 +348,13 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { .getName()); JcrUtils.copy(specAttrNode, realizedAttrNode); - // for (PropertyIterator pit = realizedAttrNode.getProperties(); - // pit - // .hasNext();) { - // Property p = pit.nextProperty(); - // if (!p.isMultiple()) - // log.debug(p.getName() + "=" + p.getValue().getString()); - // } + // ovveride with flow value + if (flowNode.hasNode(attrName)) { + // assuming this is a primitive + realizedAttrNode.setProperty(SLC_VALUE, + flowNode.getNode(attrName).getProperty(SLC_VALUE) + .getValue()); + } } flowsViewer.refresh(); @@ -446,14 +415,19 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { } /** Optimization so that we don't call the node each time */ - protected Boolean isEditable(String status) { + protected static Boolean isEditable(String status) { return status.equals(ExecutionProcess.NEW) || status.equals(ExecutionProcess.INITIALIZED); } - protected Boolean isFinished(String status) { + protected static Boolean isFinished(String status) { return status.equals(ExecutionProcess.COMPLETED) - || status.equals(ExecutionProcess.ERROR); + || status.equals(ExecutionProcess.ERROR) + || status.equals(ExecutionProcess.KILLED); + } + + protected static Boolean isRunning(String status) { + return status.equals(ExecutionProcess.RUNNING); } /* @@ -554,6 +528,18 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { Node node = (Node) element; try { if (node.isNodeType(SlcTypes.SLC_REALIZED_FLOW)) { + if (node.hasProperty(SLC_STATUS)) { + String status = node.getProperty(SLC_STATUS) + .getString(); + // TODO: factorize with process view ? + if (status.equals(ExecutionProcess.RUNNING)) + return SlcImages.PROCESS_RUNNING; + else if (status.equals(ExecutionProcess.ERROR) + || status.equals(ExecutionProcess.KILLED)) + return SlcImages.PROCESS_ERROR; + else if (status.equals(ExecutionProcess.COMPLETED)) + return SlcImages.PROCESS_COMPLETED; + } return SlcImages.FLOW; } } catch (RepositoryException e) { @@ -595,11 +581,18 @@ public class ProcessBuilderPage extends FormPage implements SlcNames { + SlcTypes.SLC_EXECUTION_FLOW + "] WHERE ISDESCENDANTNODE(['" + path + "']) OR ISSAMENODE(['" + path + "'])"; - //log.debug(statement); + // log.debug(statement); Query query = qm.createQuery(statement, Query.JCR_SQL2); + + // order paths + SortedSet paths = new TreeSet(); for (NodeIterator nit = query.execute().getNodes(); nit .hasNext();) { - addFlow(nit.nextNode().getPath()); + paths.add(nit.nextNode().getPath()); + } + + for (String p : paths) { + addFlow(p); } return true; } catch (RepositoryException e) {