Make code easier to debug

[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 6e30a48e16d3683a8ea04555fad7e3545129038b..833cc89d16f5bc57dd2567071e82397e0b9cc2eb 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.
@@ -37,7 +37,9 @@ import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 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;
@@ -86,13 +88,12 @@ 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);
 
        /** To be displayed in empty lists */
        final static String NONE = "<none>";
 
        private Node processNode;
+       private final ExecutionModulesManager modulesManager;
 
        private TreeViewer flowsViewer;
        private TableViewer valuesViewer;
@@ -104,9 +105,11 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
        private AbstractFormPart formPart;
        private EventListener statusObserver;
 
-       public ProcessBuilderPage(ProcessEditor editor, Node processNode) {
+       public ProcessBuilderPage(ProcessEditor editor, Node processNode,
+                       ExecutionModulesManager modulesManager) {
                super(editor, ID, "Definition");
                this.processNode = processNode;
+               this.modulesManager = modulesManager;
        }
 
        @Override
@@ -246,6 +249,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());
@@ -461,39 +466,14 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
        /*
         * UTILITIES
         */
-       // protected static Object getAttributeSpecValue(Node specAttrNode) {
-       // try {
-       // if (specAttrNode.isNodeType(SlcTypes.SLC_PRIMITIVE_SPEC_ATTRIBUTE)) {
-       // if (!specAttrNode.hasProperty(SLC_VALUE))
-       // return null;
-       // String type = specAttrNode.getProperty(SLC_TYPE).getString();
-       // // TODO optimize based on data type?
-       // Object value = PrimitiveUtils.convert(type, specAttrNode
-       // .getProperty(SLC_VALUE).getString());
-       // // log.debug(specAttrNode + ", type=" + type + ", value=" +
-       // // value);
-       // return value;
-       // } else if (specAttrNode.isNodeType(SlcTypes.SLC_REF_SPEC_ATTRIBUTE)) {
-       // if (specAttrNode.hasNode(SLC_VALUE)) {
-       // // return the index of the sub node
-       // // in the future we may manage reference as well
-       // return specAttrNode.getProperty(SLC_VALUE).getLong();
-       // } else
-       // return null;
-       // }
-       // return null;
-       // } catch (RepositoryException e) {
-       // throw new SlcException("Cannot get value", e);
-       // }
-       //
-       // }
-
        protected static String getAttributeSpecText(Node specAttrNode) {
                try {
                        if (specAttrNode.isNodeType(SlcTypes.SLC_PRIMITIVE_SPEC_ATTRIBUTE)) {
                                if (!specAttrNode.hasProperty(SLC_VALUE))
                                        return "";
                                String type = specAttrNode.getProperty(SLC_TYPE).getString();
+                               if (PrimitiveAccessor.TYPE_PASSWORD.equals(type))
+                                       return "****************";
                                Object value = PrimitiveUtils.convert(type, specAttrNode
                                                .getProperty(SLC_VALUE).getString());
                                return value.toString();
@@ -525,7 +505,7 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
        /*
         * FLOWS SUBCLASSES
         */
-       static class FlowsContentProvider implements ITreeContentProvider {
+       class FlowsContentProvider implements ITreeContentProvider {
                public Object[] getElements(Object obj) {
                        if (!(obj instanceof Node))
                                return new Object[0];
@@ -534,11 +514,13 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                                Node node = (Node) obj;
                                List<Node> children = new ArrayList<Node>();
                                for (NodeIterator nit = node.getNode(SLC_FLOW).getNodes(); nit
-                                               .hasNext();)
-                                       children.add(nit.nextNode());
+                                               .hasNext();) {
+                                       Node flowNode = nit.nextNode();
+                                       children.add(flowNode);
+                               }
                                return children.toArray();
                        } catch (RepositoryException e) {
-                               throw new SlcException("Cannot list children of " + obj, e);
+                               throw new SlcException("Cannot list flows of " + obj, e);
                        }
                }
 
@@ -564,7 +546,6 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
        }
 
        static class FlowsLabelProvider extends ColumnLabelProvider {
-
                @Override
                public String getText(Object element) {
                        Node node = (Node) element;
@@ -573,10 +554,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);
                                        }
@@ -718,7 +701,14 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                                Node specAttrNode = (Node) element;
                                if (specAttrNode
                                                .isNodeType(SlcTypes.SLC_PRIMITIVE_SPEC_ATTRIBUTE)) {
-                                       return new TextCellEditor(tableViewer.getTable());
+                                       String type = specAttrNode.getProperty(SLC_TYPE)
+                                                       .getString();
+                                       if (PrimitiveAccessor.TYPE_PASSWORD.equals(type)) {
+                                               return new TextCellEditor(tableViewer.getTable(),
+                                                               SWT.PASSWORD);
+                                       } else {
+                                               return new TextCellEditor(tableViewer.getTable());
+                                       }
                                } else if (specAttrNode
                                                .isNodeType(SlcTypes.SLC_REF_SPEC_ATTRIBUTE)) {
                                        NodeIterator children = specAttrNode.getNodes();
@@ -734,7 +724,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);
                        }
                }
 
@@ -742,10 +732,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);
@@ -767,9 +758,6 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                protected Object getValue(Object element) {
                        Node specAttrNode = (Node) element;
                        try {
-                               // Object value = getAttributeSpecValue(specAttrNode);
-                               // if (value == null)
-                               // throw new SlcException("Unsupported attribute " + element);
                                if (specAttrNode
                                                .isNodeType(SlcTypes.SLC_PRIMITIVE_SPEC_ATTRIBUTE)) {
                                        if (!specAttrNode.hasProperty(SLC_VALUE))