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;h=c438463d85d734ac80279ff26b1f2b6a376ea877;hb=9884b3225a86b831917b10376925eebcbf99e513;hp=99a169e6d455e15ae104f6a894a8f2d3c2f3ace5;hpb=ae696952b94054d3b9ec8ab05c02fc82d11607bf;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 99a169e6d..c438463d8 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
@@ -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,18 +20,17 @@ 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;
 import org.argeo.jcr.RepositoryRegister;
-import org.argeo.jcr.security.JcrKeyring;
+import org.argeo.jcr.UserJcrUtils;
 import org.argeo.jcr.ui.explorer.model.RepositoriesNode;
 import org.argeo.jcr.ui.explorer.model.SingleJcrNode;
 import org.argeo.jcr.ui.explorer.utils.TreeObjectsComparator;
+import org.argeo.util.security.Keyring;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
@@ -26,22 +40,54 @@ import org.eclipse.jface.viewers.Viewer;
  * 
  */
 public class NodeContentProvider implements ITreeContentProvider {
-	private final static Log log = LogFactory.getLog(NodeContentProvider.class);
+	final private RepositoryRegister repositoryRegister;
+	final private RepositoryFactory repositoryFactory;
+	/**
+	 * A session of the logged in user on the default workspace of the node
+	 * repository.
+	 */
+	final private Session userSession;
+	final private Keyring keyring;
+	final private boolean sortChildren;
 
-	// Business Objects
-	private RepositoryRegister repositoryRegister;
-	private Session userSession;
-	private JcrKeyring jcrKeyring;
+	// 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) {
-		this.userSession = jcrKeyring != null ? jcrKeyring.getSession() : null;
-		this.jcrKeyring = jcrKeyring;
+	public NodeContentProvider(Session userSession, Keyring keyring,
+			RepositoryRegister repositoryRegister,
+			RepositoryFactory repositoryFactory, Boolean sortChildren) {
+		this.userSession = userSession;
+		this.keyring = keyring;
 		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 = UserJcrUtils.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, userSession,
+					keyring);
+		}
 	}
 
 	/**
@@ -50,16 +96,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 +144,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) {
-	}
 }