Clean session management.

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

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 87b7f86940db8f72a35d06f81cbf1f1f5848d08d..59473c667321e56f722d2a17a62d727d705279cf 100644 (file)
--- 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
@@ -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.
@@ -16,13 +16,13 @@
 package org.argeo.slc.client.ui.editors;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
@@ -33,8 +33,6 @@ import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.controllers.ProcessController;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
-import org.argeo.slc.execution.ExecutionProcessNotifier;
-import org.argeo.slc.execution.ExecutionStep;
 import org.argeo.slc.jcr.SlcJcrUtils;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
@@ -47,8 +45,7 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.forms.editor.FormEditor;
 
 /** Editor for an execution process. */
-public class ProcessEditor extends FormEditor implements
-               ExecutionProcessNotifier, SlcTypes, SlcNames {
+public class ProcessEditor extends FormEditor implements SlcTypes, SlcNames {
        public final static String ID = ClientUiPlugin.ID + ".processEditor";
 
        private Session session;
@@ -113,6 +110,7 @@ public class ProcessEditor extends FormEditor implements
        @Override
        public void dispose() {
                JcrUtils.logoutQuietly(session);
+               super.dispose();
        }
 
        /** Actually runs the process. */
@@ -153,7 +151,7 @@ public class ProcessEditor extends FormEditor implements
                        Map<String, String> properties = new HashMap<String, String>();
                        properties.put(ExecutionModulesManager.SLC_PROCESS_ID,
                                        process.getUuid());
-                       modulesManager.registerProcessNotifier(this, properties);
+                       // modulesManager.registerProcessNotifier(this, properties);
                } catch (Exception e) {
                        ErrorFeedback.show("Execution of " + processNode + " failed", e);
                }
@@ -213,8 +211,7 @@ public class ProcessEditor extends FormEditor implements
        @Override
        protected void addPages() {
                try {
-                       builderPage = new ProcessBuilderPage(this, processNode,
-                                       modulesManager);
+                       builderPage = new ProcessBuilderPage(this, processNode);
                        addPage(builderPage);
                        firePropertyChange(PROP_DIRTY);
                } catch (PartInitException e) {
@@ -235,11 +232,15 @@ public class ProcessEditor extends FormEditor implements
                        editorDirtyStateChanged();
                } catch (RepositoryException e) {
                        throw new SlcException("Cannot save " + processNode, e);
-               } finally {
-                       JcrUtils.discardQuietly(session);
+                       // } finally {
+                       // JcrUtils.discardQuietly(session);
                }
        }
 
+       public void setEditorTitle(String title) {
+               setPartName(title);
+       }
+
        @Override
        public void doSaveAs() {
        }
@@ -249,18 +250,29 @@ public class ProcessEditor extends FormEditor implements
                return false;
        }
 
-       public void updateStatus(ExecutionProcess process, String oldStatus,
-                       String newStatus) {
-       }
-
-       public void addSteps(ExecutionProcess process, List<ExecutionStep> steps) {
-       }
+       // public void updateStatus(ExecutionProcess process, String oldStatus,
+       // String newStatus) {
+       // }
+       //
+       // public void addSteps(ExecutionProcess process, List<ExecutionStep> steps)
+       // {
+       // }
 
        /** Expects one session per editor. */
+       @Deprecated
        public void setSession(Session session) {
                this.session = session;
        }
 
+       public void setRepository(Repository repository) {
+               try {
+                       session = repository.login();
+               } catch (RepositoryException re) {
+                       throw new SlcException("Unable to log in Repository " + repository,
+                                       re);
+               }
+       }
+
        public void setProcessController(ProcessController processController) {
                this.processController = processController;
        }
@@ -268,5 +280,4 @@ public class ProcessEditor extends FormEditor implements
        public void setModulesManager(ExecutionModulesManager modulesManager) {
                this.modulesManager = modulesManager;
        }
-
 }