fix a few bugs

[lgpl/argeo-commons.git] / server / plugins / org.argeo.jcr.ui.explorer / src / main / java / org / argeo / jcr / ui / explorer / browser / NodeContentProvider.java

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 c0ae9c42256ccfa9c64edebf557dae378106411b..99a169e6d455e15ae104f6a894a8f2d3c2f3ace5 100644 (file)
--- 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,11 +1,14 @@
 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.Session;
 
+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;
@@ -13,6 +16,7 @@ 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;
 
@@ -22,8 +26,7 @@ import org.eclipse.jface.viewers.Viewer;
  * 
  */
 public class NodeContentProvider implements ITreeContentProvider {
-       // private final static Log log =
-       // LogFactory.getLog(NodeContentProvider.class);
+       private final static Log log = LogFactory.getLog(NodeContentProvider.class);
 
        // Business Objects
        private RepositoryRegister repositoryRegister;
@@ -31,7 +34,8 @@ public class NodeContentProvider implements ITreeContentProvider {
        private JcrKeyring jcrKeyring;
 
        // Utils
-       // private ItemComparator itemComparator = new ItemComparator();
+       private boolean sortChildren = true;
+       private TreeObjectsComparator itemComparator = new TreeObjectsComparator();
 
        public NodeContentProvider(JcrKeyring jcrKeyring,
                        RepositoryRegister repositoryRegister) {
@@ -60,35 +64,22 @@ public class NodeContentProvider implements ITreeContentProvider {
        }
 
        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<RepositoryNode> nodes = new ArrayList<RepositoryNode>();
-               // Map<String, Repository> 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,15 +99,8 @@ 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() {
@@ -124,21 +108,4 @@ public class NodeContentProvider implements ITreeContentProvider {
 
        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
        }
-
-       // protected Object[] childrenNodes(Node parentNode) {
-       // try {
-       // List<Node> children = new ArrayList<Node>();
-       // 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);
-       // }
-       // }
-
 }