X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fjcr%2FJcrTreeContentProvider.java;h=8f9ac1c75f24fa2b95d17ddfe17d543398cfd0d8;hb=e7dc62c485696931a3e048d9102a7c86f9323b92;hp=f45e876f0d4aba7faa6358b867a05e54fdb5b276;hpb=2d5dd10f58c42aab9351c76801c57034cbe87f8e;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrTreeContentProvider.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrTreeContentProvider.java index f45e876f0..8f9ac1c75 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrTreeContentProvider.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/JcrTreeContentProvider.java @@ -24,7 +24,7 @@ import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; import org.argeo.eclipse.ui.EclipseUiException; -import org.argeo.eclipse.ui.jcr.utils.JcrItemsComparator; +import org.argeo.eclipse.ui.jcr.util.JcrItemsComparator; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -38,20 +38,12 @@ public class JcrTreeContentProvider implements ITreeContentProvider { private JcrItemsComparator itemComparator = new JcrItemsComparator(); /** - * Sends back the first level of the Tree. input element must be a single - * node object + * Sends back the first level of the Tree. input element must be a single node + * object */ public Object[] getElements(Object inputElement) { - try { - Node rootNode = (Node) inputElement; - List result = new ArrayList(); - NodeIterator ni = rootNode.getNodes(); - while (ni.hasNext()) - result.add(ni.nextNode()); - return result.toArray(); - } catch (RepositoryException re) { - throw new EclipseUiException("Unable to retrieve elements for " + inputElement, re); - } + Node rootNode = (Node) inputElement; + return childrenNodes(rootNode); } public Object[] getChildren(Object parentElement) { @@ -82,8 +74,13 @@ public class JcrTreeContentProvider implements ITreeContentProvider { try { List children = new ArrayList(); NodeIterator nit = parentNode.getNodes(); - while (nit.hasNext()) - children.add(nit.nextNode()); + while (nit.hasNext()) { + Node node = nit.nextNode(); +// if (node.getName().startsWith("rep:") || node.getName().startsWith("jcr:") +// || node.getName().startsWith("nt:")) +// continue nodes; + children.add(node); + } Node[] arr = children.toArray(new Node[0]); Arrays.sort(arr, itemComparator); return arr;