Remove modules manager from process builder page

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui / src / main / java / org / argeo / slc / client / ui / editors / ProcessBuilderPage.java

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
index 31b5d30b8eb0d961ace4c7348c5c7459c0f3ca1d..3c757ff9aea291100761a170d21dac4f2247803e 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.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.
@@ -33,15 +33,12 @@ import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 
 import org.argeo.ArgeoException;
-import org.argeo.eclipse.ui.ErrorFeedback;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.core.execution.PrimitiveAccessor;
 import org.argeo.slc.core.execution.PrimitiveUtils;
-import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.jcr.SlcJcrUtils;
 import org.argeo.slc.jcr.SlcNames;
@@ -95,7 +92,6 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
        final static String NONE = "<none>";
 
        private Node processNode;
-       private final ExecutionModulesManager modulesManager;
 
        private TreeViewer flowsViewer;
        private TableViewer valuesViewer;
@@ -107,11 +103,9 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
        private AbstractFormPart formPart;
        private EventListener statusObserver;
 
-       public ProcessBuilderPage(ProcessEditor editor, Node processNode,
-                       ExecutionModulesManager modulesManager) {
+       public ProcessBuilderPage(ProcessEditor editor, Node processNode) {
                super(editor, ID, "Definition");
                this.processNode = processNode;
-               this.modulesManager = modulesManager;
        }
 
        @Override
@@ -251,6 +245,8 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                GridData valuedGd = new GridData(SWT.FILL, SWT.FILL, true, true);
                // valuedGd.widthHint = 200;
                valuesViewer.getTable().setLayoutData(valuedGd);
+               valuesViewer.getTable().setHeaderVisible(true);
+
                valuesViewer.setContentProvider(new ValuesContentProvider());
                initializeValuesViewer(valuesViewer);
                sashForm.setWeights(getWeights());
@@ -517,22 +513,6 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                                                .hasNext();) {
                                        Node flowNode = nit.nextNode();
                                        children.add(flowNode);
-                                       try {
-                                               // make sure modules are started for all nodes
-                                               String flowDefPath = flowNode.getNode(SLC_ADDRESS)
-                                                               .getProperty(Property.JCR_PATH).getString();
-                                               Node executionModuleNode = flowNode.getSession()
-                                                               .getNode(SlcJcrUtils.modulePath(flowDefPath));
-                                               if (!executionModuleNode.getProperty(SLC_STARTED)
-                                                               .getBoolean())
-                                                       ClientUiPlugin.startStopExecutionModule(
-                                                                       modulesManager, executionModuleNode);
-                                       } catch (Exception e) {
-                                               ErrorFeedback.show(
-                                                               "Cannot start execution module related to "
-                                                                               + flowNode, e);
-                                       }
-
                                }
                                return children.toArray();
                        } catch (RepositoryException e) {
@@ -562,7 +542,6 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
        }
 
        static class FlowsLabelProvider extends ColumnLabelProvider {
-
                @Override
                public String getText(Object element) {
                        Node node = (Node) element;
@@ -571,10 +550,12 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                                        if (node.hasNode(SLC_ADDRESS)) {
                                                String path = node.getNode(SLC_ADDRESS)
                                                                .getProperty(Property.JCR_PATH).getString();
-                                               Node executionModuleNode = node.getSession().getNode(
-                                                               SlcJcrUtils.modulePath(path));
-                                               String executionModuleName = executionModuleNode
-                                                               .getProperty(SLC_NAME).getString();
+                                               String executionModuleName = SlcJcrUtils
+                                                               .moduleName(path);
+                                               // Node executionModuleNode = node.getSession().getNode(
+                                               // SlcJcrUtils.modulePath(path));
+                                               // String executionModuleName = executionModuleNode
+                                               // .getProperty(SLC_NAME).getString();
                                                return executionModuleName + ":"
                                                                + SlcJcrUtils.flowRelativePath(path);
                                        }
@@ -739,7 +720,7 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                                }
                                return null;
                        } catch (RepositoryException e) {
-                               throw new SlcException("Cannot get celle editor", e);
+                               throw new SlcException("Cannot get cell editor", e);
                        }
                }
 
@@ -747,10 +728,11 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                protected boolean canEdit(Object element) {
                        try {
                                Node specAttrNode = (Node) element;
-                               return !(specAttrNode.getProperty(SLC_IS_IMMUTABLE)
-                                               .getBoolean() || specAttrNode.getProperty(
-                                               SLC_IS_CONSTANT).getBoolean())
-                                               && isSupportedAttributeType(specAttrNode);
+                               Boolean cannotEdit = specAttrNode.getProperty(SLC_IS_IMMUTABLE)
+                                               .getBoolean()
+                                               || specAttrNode.getProperty(SLC_IS_CONSTANT)
+                                                               .getBoolean();
+                               return !cannotEdit && isSupportedAttributeType(specAttrNode);
                        } catch (RepositoryException e) {
                                throw new SlcException("Cannot check whether " + element
                                                + " is editable", e);