X-Git-Url: https://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=4790649d259b12deee180356e478f458cf37fe4b;hb=fd57c2fdf6dac352806fc5517355627c545e768b;hp=e18992fe730131156cb91d160cee9c9a13f9e56f;hpb=c0b7b3f9d1781d074ab35d24017042fa9415e1e4;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 e18992fe7..4790649d2 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,19 +1,20 @@
 package org.argeo.jcr.ui.explorer.browser;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 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;
 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.ui.explorer.utils.TreeObjectsComparator;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
@@ -23,19 +24,50 @@ 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;
+	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 ItemComparator itemComparator = new ItemComparator();
+	private TreeObjectsComparator itemComparator = new TreeObjectsComparator();
 
-	public NodeContentProvider(Session userSession,
-			RepositoryRegister repositoryRegister) {
-		this.userSession = userSession;
+	public NodeContentProvider(JcrKeyring jcrKeyring,
+			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 (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, null, jcrKeyring);
+		}
 	}
 
 	/**
@@ -44,49 +76,30 @@ 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));
+		if (homeNode != null)
+			objs.add(homeNode);
+		if (repositoriesNode != null)
+			objs.add(repositoriesNode);
 		return objs.toArray();
 	}
 
 	public Object[] getChildren(Object parentElement) {
-		// if (parentElement instanceof Node) {
-		// return childrenNodes((Node) parentElement);
-		// } else if (parentElement instanceof RepositoryNode) {
-		// return ((RepositoryNode) parentElement).getChildren();
-		// } else if (parentElement instanceof WorkspaceNode) {
-		// Session session = ((WorkspaceNode) parentElement).getSession();
-		// if (session == null)
-		// return new Object[0];
-		//
-		// try {
-		// return childrenNodes(session.getRootNode());
-		// } catch (RepositoryException e) {
-		// throw new ArgeoException("Cannot retrieve root node of "
-		// + session, e);
-		// }
-		// } else if (parentElement instanceof RepositoryRegister) {
-		// RepositoryRegister repositoryRegister = (RepositoryRegister)
-		// parentElement;
-		// List<RepositoryNode> nodes = new ArrayList<RepositoryNode>();
-		// Map<String, Repository> repositories = repositoryRegister
-		// .getRepositories();
-		// for (String name : repositories.keySet()) {
-		// nodes.add(new RepositoryNode(name, repositories.get(name)));
-		// }
-		// return nodes.toArray();
-
-		if (parentElement instanceof TreeParent)
-			return ((TreeParent) parentElement).getChildren();
-		else {
+		if (parentElement instanceof TreeParent) {
+			if (sortChildren) {
+				// TreeParent[] arr = (TreeParent[]) ((TreeParent)
+				// parentElement)
+				// .getChildren();
+				Object[] tmpArr = ((TreeParent) parentElement).getChildren();
+				TreeParent[] arr = new TreeParent[tmpArr.length];
+				for (int i = 0; i < tmpArr.length; i++)
+					arr[i] = (TreeParent) tmpArr[i];
+
+				Arrays.sort(arr, itemComparator);
+				return arr;
+			} else
+				return ((TreeParent) parentElement).getChildren();
+
+		} else {
 			return new Object[0];
 		}
 	}
@@ -106,37 +119,18 @@ public class NodeContentProvider implements ITreeContentProvider {
 		} else if (element instanceof TreeParent) {
 			TreeParent tp = (TreeParent) element;
 			return tp.hasChildren();
-			// } else if (element instanceof RepositoryNode) {
-			// return ((RepositoryNode) element).hasChildren();
-			// } else if (element instanceof WorkspaceNode) {
-			// return ((WorkspaceNode) element).getSession() != null;
 		}
 		return false;
-		// } catch (RepositoryException e) {
-		// throw new ArgeoException("Cannot check children of " + element, e);
-		// }
 	}
 
 	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) {
-	}
-
-	// protected Object[] childrenNodes(Node parentNode) {
-	// try {
-	// List<Node> children = new ArrayList<Node>();
-	// NodeIterator nit = parentNode.getNodes();
-	// while (nit.hasNext()) {
-	// Node node = nit.nextNode();
-	// children.add(node);
-	// }
-	// Node[] arr = children.toArray(new Node[children.size()]);
-	// Arrays.sort(arr, itemComparator);
-	// return arr;
-	// } catch (RepositoryException e) {
-	// throw new ArgeoException("Cannot list children of " + parentNode, e);
-	// }
-	// }
-
 }