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=c2de694dd8d5051f3b905ecd03f9475440cc72a6;hb=f53af8d52b0364ae25c2256b4772c08fe86f3340;hp=a1aca2b20ca3e608612e08184a1adcae67b92206;hpb=2c4852dcd20d4cde88776c527ae935f242ae1e77;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 a1aca2b20..c2de694dd 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,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.
@@ -25,12 +25,12 @@ import javax.jcr.Session;
 
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.jcr.ArgeoJcrConstants;
-import org.argeo.jcr.ArgeoJcrUtils;
 import org.argeo.jcr.RepositoryRegister;
-import org.argeo.jcr.security.JcrKeyring;
-import org.argeo.jcr.ui.explorer.model.RepositoriesNode;
-import org.argeo.jcr.ui.explorer.model.SingleJcrNode;
+import org.argeo.jcr.UserJcrUtils;
+import org.argeo.jcr.ui.explorer.model.RepositoriesElem;
+import org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem;
 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;
 
@@ -40,28 +40,28 @@ import org.eclipse.jface.viewers.Viewer;
  * 
  */
 public class NodeContentProvider implements ITreeContentProvider {
-	// private final static Log log =
-	// LogFactory.getLog(NodeContentProvider.class);
-
-	// Business Objects
 	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 JcrKeyring jcrKeyring;
+	final private Keyring keyring;
 	final private boolean sortChildren;
 
 	// reference for cleaning
-	private SingleJcrNode homeNode = null;
-	private RepositoriesNode repositoriesNode = null;
+	private SingleJcrNodeElem homeNode = null;
+	private RepositoriesElem repositoriesNode = null;
 
 	// Utils
 	private TreeObjectsComparator itemComparator = new TreeObjectsComparator();
 
-	public NodeContentProvider(JcrKeyring jcrKeyring,
+	public NodeContentProvider(Session userSession, Keyring keyring,
 			RepositoryRegister repositoryRegister,
 			RepositoryFactory repositoryFactory, Boolean sortChildren) {
-		this.userSession = jcrKeyring != null ? jcrKeyring.getSession() : null;
-		this.jcrKeyring = jcrKeyring;
+		this.userSession = userSession;
+		this.keyring = keyring;
 		this.repositoryRegister = repositoryRegister;
 		this.repositoryFactory = repositoryFactory;
 		this.sortChildren = sortChildren;
@@ -72,20 +72,21 @@ public class NodeContentProvider implements ITreeContentProvider {
 			return;
 
 		if (userSession != null) {
-			Node userHome = ArgeoJcrUtils.getUserHome(userSession);
+			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,
+				homeNode = new SingleJcrNodeElem(null, userHome,
 						userSession.getUserID(), ArgeoJcrConstants.ALIAS_NODE);
 			}
 		}
 		if (repositoryRegister != null) {
 			if (repositoriesNode != null)
 				repositoriesNode.dispose();
-			repositoriesNode = new RepositoriesNode("Repositories",
-					repositoryRegister, repositoryFactory, null, jcrKeyring);
+			repositoriesNode = new RepositoriesElem("Repositories",
+					repositoryRegister, repositoryFactory, null, userSession,
+					keyring);
 		}
 	}
 
@@ -131,8 +132,8 @@ public class NodeContentProvider implements ITreeContentProvider {
 	}
 
 	public boolean hasChildren(Object element) {
-		if (element instanceof RepositoriesNode) {
-			RepositoryRegister rr = ((RepositoriesNode) element)
+		if (element instanceof RepositoriesElem) {
+			RepositoryRegister rr = ((RepositoriesElem) element)
 					.getRepositoryRegister();
 			return rr.getRepositories().size() > 0;
 		} else if (element instanceof TreeParent) {