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;fp=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fbrowser%2FNodeContentProvider.java;h=e18992fe730131156cb91d160cee9c9a13f9e56f;hb=c0b7b3f9d1781d074ab35d24017042fa9415e1e4;hp=59ef4c1a26fba0742fe0fd8113f97d5db3d53bdb;hpb=ed36fb56ac5aff2d606b35be175eb32657d6ec56;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 59ef4c1a2..e18992fe7 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,19 @@ package org.argeo.jcr.ui.explorer.browser; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.Map; import javax.jcr.Node; -import javax.jcr.NodeIterator; -import javax.jcr.Repository; -import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.argeo.ArgeoException; +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.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -23,11 +23,15 @@ import org.eclipse.jface.viewers.Viewer; * */ public class NodeContentProvider implements ITreeContentProvider { - private ItemComparator itemComparator = new ItemComparator(); + private final static Log log = LogFactory.getLog(NodeContentProvider.class); + // Business Objects private RepositoryRegister repositoryRegister; private Session userSession; + // Utils + // private ItemComparator itemComparator = new ItemComparator(); + public NodeContentProvider(Session userSession, RepositoryRegister repositoryRegister) { this.userSession = userSession; @@ -43,73 +47,74 @@ public class NodeContentProvider implements ITreeContentProvider { if (userSession != null) { Node userHome = JcrUtils.getUserHome(userSession); if (userHome != null) - objs.add(userHome); + // 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(repositoryRegister); + objs.add(new RepositoriesNode("Repositories", repositoryRegister, + null)); 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(); - } else { + // 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 { return new Object[0]; } } public Object getParent(Object element) { - try { - if (element instanceof Node) { - Node node = (Node) element; - if (!node.getPath().equals("/")) - return node.getParent(); - else - return null; - } - return null; - } catch (RepositoryException e) { + if (element instanceof TreeParent) { + return ((TreeParent) element).getParent(); + } else return null; - } } public boolean hasChildren(Object element) { - try { - if (element instanceof Node) { - return ((Node) element).hasNodes(); - } else if (element instanceof RepositoryNode) { - return ((RepositoryNode) element).hasChildren(); - } else if (element instanceof WorkspaceNode) { - return ((WorkspaceNode) element).getSession() != null; - } else if (element instanceof RepositoryRegister) { - return ((RepositoryRegister) element).getRepositories().size() > 0; - } - return false; - } catch (RepositoryException e) { - throw new ArgeoException("Cannot check children of " + element, e); + if (element instanceof RepositoriesNode) { + RepositoryRegister rr = ((RepositoriesNode) 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() { @@ -118,20 +123,20 @@ public class NodeContentProvider implements ITreeContentProvider { 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); - } - } + // 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); + // } + // } }