Improve cleaning of the model (bug 23)

[lgpl/argeo-commons.git] / server / plugins / org.argeo.jcr.ui.explorer / src / main / java / org / argeo / jcr / ui / explorer / browser / NodeContentProvider.java

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java
index 99a169e6d455e15ae104f6a894a8f2d3c2f3ace5..085087201e5d8921e3c01df10203446cf17b27c6 100644 (file)
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java
@@ -7,8 +7,6 @@ import java.util.List;
 import javax.jcr.Node;
 import javax.jcr.Session;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.jcr.ArgeoJcrConstants;
 import org.argeo.jcr.JcrUtils;
@@ -26,22 +24,47 @@ import org.eclipse.jface.viewers.Viewer;
  * 
  */
 public class NodeContentProvider implements ITreeContentProvider {
-       private final static Log log = LogFactory.getLog(NodeContentProvider.class);
+       // private final static Log log =
+       // LogFactory.getLog(NodeContentProvider.class);
 
        // Business Objects
-       private RepositoryRegister repositoryRegister;
-       private Session userSession;
-       private JcrKeyring jcrKeyring;
+       final private RepositoryRegister repositoryRegister;
+       final private Session userSession;
+       final private JcrKeyring jcrKeyring;
+       final private boolean sortChildren;
+
+       // reference for cleaning
+       private SingleJcrNode homeNode = null;
+       private RepositoriesNode repositoriesNode = null;
 
        // Utils
-       private boolean sortChildren = true;
        private TreeObjectsComparator itemComparator = new TreeObjectsComparator();
 
        public NodeContentProvider(JcrKeyring jcrKeyring,
-                       RepositoryRegister repositoryRegister) {
+                       RepositoryRegister repositoryRegister, Boolean sortChildren) {
                this.userSession = jcrKeyring != null ? jcrKeyring.getSession() : null;
                this.jcrKeyring = jcrKeyring;
                this.repositoryRegister = repositoryRegister;
+               this.sortChildren = sortChildren;
+       }
+
+       public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+               if (userSession != null) {
+                       Node userHome = JcrUtils.getUserHome(userSession);
+                       if (userHome != null) {
+                               // TODO : find a way to dynamically get alias for the node
+                               if (homeNode != null)
+                                       homeNode.dispose();
+                               homeNode = new SingleJcrNode(null, userHome,
+                                               userSession.getUserID(), ArgeoJcrConstants.ALIAS_NODE);
+                       }
+               }
+               if (repositoryRegister != null) {
+                       if (repositoriesNode != null)
+                               repositoriesNode.dispose();
+                       repositoriesNode = new RepositoriesNode("Repositories",
+                                       repositoryRegister, null, jcrKeyring);
+               }
        }
 
        /**
@@ -50,16 +73,10 @@ public class NodeContentProvider implements ITreeContentProvider {
         */
        public Object[] getElements(Object inputElement) {
                List<Object> objs = new ArrayList<Object>();
-               if (userSession != null) {
-                       Node userHome = JcrUtils.getUserHome(userSession);
-                       if (userHome != null)
-                               // TODO : find a way to dynamically get alias for the node
-                               objs.add(new SingleJcrNode(null, userHome, userSession
-                                               .getUserID(), ArgeoJcrConstants.ALIAS_NODE));
-               }
-               if (repositoryRegister != null)
-                       objs.add(new RepositoriesNode("Repositories", repositoryRegister,
-                                       null, jcrKeyring));
+               if (homeNode != null)
+                       objs.add(homeNode);
+               if (repositoriesNode != null)
+                       objs.add(repositoriesNode);
                return objs.toArray();
        }
 
@@ -104,8 +121,13 @@ public class NodeContentProvider implements ITreeContentProvider {
        }
 
        public void dispose() {
+               if (homeNode != null)
+                       homeNode.dispose();
+               if (repositoriesNode != null) {
+                       // logs out open sessions
+                       // see https://bugzilla.argeo.org/show_bug.cgi?id=23
+                       repositoriesNode.dispose();
+               }
        }
 
-       public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-       }
 }