X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=plugins%2Forg.argeo.slc.akb.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fakb%2Fui%2Fproviders%2FTemplatesTreeContentProvider.java;fp=plugins%2Forg.argeo.slc.akb.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fakb%2Fui%2Fproviders%2FTemplatesTreeContentProvider.java;h=e35302864bb041c85f8dabbfe184b314bb8d5a3e;hb=65c1e73020652f7b70110268de6cc2c89624a9c2;hp=1f39f33d84ff9841a1dfa28b92e58826cf1e3cda;hpb=334b8d38cca7e1305de143b8457e07c34f527d88;p=gpl%2Fargeo-slc.git diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/TemplatesTreeContentProvider.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/TemplatesTreeContentProvider.java index 1f39f33d8..e35302864 100644 --- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/TemplatesTreeContentProvider.java +++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/TemplatesTreeContentProvider.java @@ -15,13 +15,15 @@ */ package org.argeo.slc.akb.ui.providers; +import java.util.ArrayList; import java.util.List; import javax.jcr.Node; +import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; -import org.argeo.jcr.JcrUtils; import org.argeo.slc.akb.AkbException; +import org.argeo.slc.akb.AkbTypes; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -54,8 +56,15 @@ public class TemplatesTreeContentProvider implements ITreeContentProvider { public Object[] getChildren(Object parent) { try { - List nodes = JcrUtils.nodeIteratorToList(((Node) parent) - .getNodes()); + NodeIterator ni = ((Node) parent).getNodes(); + List nodes = new ArrayList(); + + while (ni.hasNext()) { + Node currNode = ni.nextNode(); + if (!currNode.isNodeType(AkbTypes.AKB_CONNECTOR_FOLDER)) + nodes.add(currNode); + } + return nodes.toArray(); } catch (RepositoryException e) { throw new AkbException("Error while getting children nodes", e); @@ -64,6 +73,7 @@ public class TemplatesTreeContentProvider implements ITreeContentProvider { public boolean hasChildren(Object parent) { try { + // refine this return ((Node) parent).hasNodes(); } catch (RepositoryException e) { throw new AkbException("Error while checking children nodes", e);