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=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..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,19 +1,36 @@ +/* + * 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. + * 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; +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.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; @@ -23,19 +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; + // reference for cleaning + private SingleJcrNodeElem homeNode = null; + private RepositoriesElem repositoriesNode = null; // Utils - // private ItemComparator itemComparator = new ItemComparator(); + private TreeObjectsComparator itemComparator = new TreeObjectsComparator(); - public NodeContentProvider(Session userSession, - RepositoryRegister repositoryRegister) { + 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 SingleJcrNodeElem(null, userHome, + userSession.getUserID(), ArgeoJcrConstants.ALIAS_NODE); + } + } + if (repositoryRegister != null) { + if (repositoriesNode != null) + repositoriesNode.dispose(); + repositoriesNode = new RepositoriesElem("Repositories", + repositoryRegister, repositoryFactory, null, userSession, + keyring); + } } /** @@ -44,49 +96,30 @@ public class NodeContentProvider implements ITreeContentProvider { */ public Object[] getElements(Object inputElement) { List objs = new ArrayList(); - 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 nodes = new ArrayList(); - // Map 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]; } } @@ -99,44 +132,25 @@ 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) { 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 children = new ArrayList(); - // 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); - // } - // } - }