Stabilize JCR explorer

[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 205874285aa196eaaf1138148a150e8fb07db713..36c44d01d71f732275adb69fa3f3b2fc7cc6bac8 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jcr.ui.explorer.browser;
 
 import java.util.ArrayList;
@@ -5,10 +20,9 @@ import java.util.Arrays;
 import java.util.List;
 
 import javax.jcr.Node;
+import javax.jcr.RepositoryFactory;
 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,41 +40,65 @@ 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
        final private RepositoryRegister repositoryRegister;
+       final private RepositoryFactory repositoryFactory;
        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 TreeObjectsComparator itemComparator = new TreeObjectsComparator();
 
        public NodeContentProvider(JcrKeyring jcrKeyring,
-                       RepositoryRegister repositoryRegister, Boolean sortChildren) {
+                       RepositoryRegister repositoryRegister,
+                       RepositoryFactory repositoryFactory, Boolean sortChildren) {
                this.userSession = jcrKeyring != null ? jcrKeyring.getSession() : null;
                this.jcrKeyring = jcrKeyring;
                this.repositoryRegister = repositoryRegister;
+               this.repositoryFactory = repositoryFactory;
                this.sortChildren = sortChildren;
        }
 
+       public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+               if (newInput == null)// dispose
+                       return;
+
+               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, repositoryFactory, null, jcrKeyring);
+               }
+       }
+
        /**
         * Sends back the first level of the Tree. Independent from inputElement
         * that can be null
         */
        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();
        }
 
@@ -105,8 +143,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) {
-       }
 }