X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fbrowser%2FNodeContentProvider.java;fp=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fbrowser%2FNodeContentProvider.java;h=085087201e5d8921e3c01df10203446cf17b27c6;hb=d24fe8d5ee68544ce3d6300ac31a0c3cb8193aba;hp=205874285aa196eaaf1138148a150e8fb07db713;hpb=f44eec19eacbae6f6642363369f414acba69f262;p=lgpl%2Fargeo-commons.git

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 205874285..085087201 100644
--- 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,7 +24,8 @@ 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;
@@ -34,6 +33,10 @@ public class NodeContentProvider implements ITreeContentProvider {
 	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();
 
@@ -45,22 +48,35 @@ public class NodeContentProvider implements ITreeContentProvider {
 		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);
+		}
+	}
+
 	/**
 	 * 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 +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) {
-	}
 }