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=a1aca2b20ca3e608612e08184a1adcae67b92206;hb=2c4852dcd20d4cde88776c527ae935f242ae1e77;hp=c0ae9c42256ccfa9c64edebf557dae378106411b;hpb=82e079d95c38d7136944d79394b9efd82a2864dd;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 c0ae9c422..a1aca2b20 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,18 +1,36 @@ +/* + * 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; +import java.util.Arrays; import java.util.List; import javax.jcr.Node; +import javax.jcr.RepositoryFactory; import javax.jcr.Session; import org.argeo.eclipse.ui.TreeParent; import org.argeo.jcr.ArgeoJcrConstants; -import org.argeo.jcr.JcrUtils; +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.ui.explorer.utils.TreeObjectsComparator; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -26,18 +44,49 @@ public class NodeContentProvider implements ITreeContentProvider { // LogFactory.getLog(NodeContentProvider.class); // Business Objects - private RepositoryRegister repositoryRegister; - private Session userSession; - private JcrKeyring jcrKeyring; + final private RepositoryRegister repositoryRegister; + final private RepositoryFactory repositoryFactory; + 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(JcrKeyring jcrKeyring, - RepositoryRegister repositoryRegister) { + RepositoryRegister repositoryRegister, + RepositoryFactory repositoryFactory, Boolean sortChildren) { this.userSession = jcrKeyring != null ? jcrKeyring.getSession() : null; this.jcrKeyring = jcrKeyring; 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 = ArgeoJcrUtils.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, jcrKeyring); + } } /** @@ -46,49 +95,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, jcrKeyring)); + 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]; } } @@ -108,37 +138,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 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); - // } - // } - }