X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fjcr%2Fbrowser%2FNodeContentProvider.java;h=3e5bc1d8dd0fe0b1d879bc7e62d02caf43671cfe;hb=fa07ed47b3933a9b78b43530eae725b7a3effe2d;hp=f8a5de98f17a4f1eedb7787cbb84de0417961410;hpb=591e96576707e4139b142026a7d915ffdde1e223;p=lgpl%2Fargeo-commons.git diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/browser/NodeContentProvider.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/browser/NodeContentProvider.java index f8a5de98f..3e5bc1d8d 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/browser/NodeContentProvider.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/browser/NodeContentProvider.java @@ -12,6 +12,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.argeo.ArgeoException; +import org.argeo.jcr.JcrUtils; import org.argeo.jcr.RepositoryRegister; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -19,8 +20,23 @@ import org.eclipse.jface.viewers.Viewer; public class NodeContentProvider implements ITreeContentProvider { private ItemComparator itemComparator = new ItemComparator(); + private RepositoryRegister repositoryRegister; + private Session userSession; + + public NodeContentProvider(Session userSession, + RepositoryRegister repositoryRegister) { + this.userSession = userSession; + this.repositoryRegister = repositoryRegister; + } + + /** Sends back the first level of the Tree. Independent from inputElement that can be null*/ public Object[] getElements(Object inputElement) { - return getChildren(inputElement); + List objs = new ArrayList(); + if (userSession != null) + objs.add(JcrUtils.getUserHome(userSession)); + if (repositoryRegister != null) + objs.add(repositoryRegister); + return objs.toArray(); } public Object[] getChildren(Object parentElement) { @@ -57,7 +73,10 @@ public class NodeContentProvider implements ITreeContentProvider { try { if (element instanceof Node) { Node node = (Node) element; + if(!node.getPath().equals("/")) return node.getParent(); + else + return null; } return null; } catch (RepositoryException e) { @@ -73,6 +92,8 @@ public class NodeContentProvider implements ITreeContentProvider { 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) {