X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Feditors%2FProcessEditor.java;fp=plugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Feditors%2FProcessEditor.java;h=71ca6b88d43416442a618a815652841018ebf8d9;hb=76420da459e9fe47612f77166f5e708648e40ef1;hp=027e7c626516ce627a17045ed98b22419caa39b3;hpb=2599d7187ce8b15ef9b9c6e0bf3292bf25cf9a46;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java
index 027e7c626..71ca6b88d 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java
@@ -55,12 +55,9 @@ public class ProcessEditor extends FormEditor implements
 	private ProcessController processController;
 
 	private ProcessBuilderPage builderPage;
-	//private ProcessLogPage logPage;
 
 	private ExecutionModulesManager modulesManager;
 
-	//private Boolean switchToLog = false;
-
 	@Override
 	public void init(IEditorSite site, IEditorInput input)
 			throws PartInitException {
@@ -86,7 +83,8 @@ public class ProcessEditor extends FormEditor implements
 	protected Node newProcessNode(ProcessEditorInput pei)
 			throws RepositoryException {
 		String uuid = UUID.randomUUID().toString();
-		String processPath = SlcJcrUtils.createExecutionProcessPath(uuid);
+		String processPath = SlcJcrUtils.createExecutionProcessPath(session,
+				uuid);
 		Node processNode = JcrUtils.mkdirs(session, processPath, SLC_PROCESS);
 		processNode.setProperty(SLC_UUID, uuid);
 		processNode.setProperty(SLC_STATUS, ExecutionProcess.NEW);
@@ -126,10 +124,6 @@ public class ProcessEditor extends FormEditor implements
 		}
 		doSave(null);
 		try {
-			// show log
-//			if (switchToLog)
-//				setActivePage(logPage.getId());
-
 			ExecutionProcess process = processController.process(processNode);
 			Map<String, String> properties = new HashMap<String, String>();
 			properties.put(ExecutionModulesManager.SLC_PROCESS_ID,
@@ -164,7 +158,8 @@ public class ProcessEditor extends FormEditor implements
 		try {
 			Session session = processNode.getSession();
 			String uuid = UUID.randomUUID().toString();
-			String destPath = SlcJcrUtils.createExecutionProcessPath(uuid);
+			String destPath = SlcJcrUtils.createExecutionProcessPath(session,
+					uuid);
 			Node newNode = JcrUtils.mkdirs(session, destPath,
 					SlcTypes.SLC_PROCESS);
 
@@ -193,11 +188,10 @@ public class ProcessEditor extends FormEditor implements
 	@Override
 	protected void addPages() {
 		try {
-			builderPage = new ProcessBuilderPage(this, processNode);
+			builderPage = new ProcessBuilderPage(this, processNode,
+					modulesManager);
 			addPage(builderPage);
 			firePropertyChange(PROP_DIRTY);
-//			logPage = new ProcessLogPage(this, processNode);
-//			addPage(logPage);
 		} catch (PartInitException e) {
 			throw new SlcException("Cannot add pages", e);
 		}
@@ -235,7 +229,6 @@ public class ProcessEditor extends FormEditor implements
 	}
 
 	public void addSteps(ExecutionProcess process, List<ExecutionStep> steps) {
-		// logPage.addSteps(steps);
 	}
 
 	/** Expects one session per editor. */