Refactor JCR explorer model

[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 b184c1eb120d94a1a35c810729bf653e16233153..c2de694dd8d5051f3b905ecd03f9475440cc72a6 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,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jcr.ui.explorer.browser;
 
 import java.util.ArrayList;
@@ -10,12 +25,12 @@ import javax.jcr.Session;
 
 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.security.JcrKeyring;
-import org.argeo.jcr.ui.explorer.model.RepositoriesNode;
-import org.argeo.jcr.ui.explorer.model.SingleJcrNode;
+import org.argeo.jcr.UserJcrUtils;
+import org.argeo.jcr.ui.explorer.model.RepositoriesElem;
+import org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem;
 import org.argeo.jcr.ui.explorer.utils.TreeObjectsComparator;
+import org.argeo.util.security.Keyring;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
@@ -25,28 +40,28 @@ import org.eclipse.jface.viewers.Viewer;
  * 
  */
 public class NodeContentProvider implements ITreeContentProvider {
-       // private final static Log log =
-       // LogFactory.getLog(NodeContentProvider.class);
-
-       // Business Objects
        final private RepositoryRegister repositoryRegister;
        final private RepositoryFactory repositoryFactory;
+       /**
+        * A session of the logged in user on the default workspace of the node
+        * repository.
+        */
        final private Session userSession;
-       final private JcrKeyring jcrKeyring;
+       final private Keyring keyring;
        final private boolean sortChildren;
 
        // reference for cleaning
-       private SingleJcrNode homeNode = null;
-       private RepositoriesNode repositoriesNode = null;
+       private SingleJcrNodeElem homeNode = null;
+       private RepositoriesElem repositoriesNode = null;
 
        // Utils
        private TreeObjectsComparator itemComparator = new TreeObjectsComparator();
 
-       public NodeContentProvider(JcrKeyring jcrKeyring,
+       public NodeContentProvider(Session userSession, Keyring keyring,
                        RepositoryRegister repositoryRegister,
                        RepositoryFactory repositoryFactory, Boolean sortChildren) {
-               this.userSession = jcrKeyring != null ? jcrKeyring.getSession() : null;
-               this.jcrKeyring = jcrKeyring;
+               this.userSession = userSession;
+               this.keyring = keyring;
                this.repositoryRegister = repositoryRegister;
                this.repositoryFactory = repositoryFactory;
                this.sortChildren = sortChildren;
@@ -57,20 +72,21 @@ public class NodeContentProvider implements ITreeContentProvider {
                        return;
 
                if (userSession != null) {
-                       Node userHome = JcrUtils.getUserHome(userSession);
+                       Node userHome = UserJcrUtils.getUserHome(userSession);
                        if (userHome != null) {
                                // TODO : find a way to dynamically get alias for the node
                                if (homeNode != null)
                                        homeNode.dispose();
-                               homeNode = new SingleJcrNode(null, userHome,
+                               homeNode = new SingleJcrNodeElem(null, userHome,
                                                userSession.getUserID(), ArgeoJcrConstants.ALIAS_NODE);
                        }
                }
                if (repositoryRegister != null) {
                        if (repositoriesNode != null)
                                repositoriesNode.dispose();
-                       repositoriesNode = new RepositoriesNode("Repositories",
-                                       repositoryRegister, repositoryFactory, null, jcrKeyring);
+                       repositoriesNode = new RepositoriesElem("Repositories",
+                                       repositoryRegister, repositoryFactory, null, userSession,
+                                       keyring);
                }
        }
 
@@ -116,8 +132,8 @@ public class NodeContentProvider implements ITreeContentProvider {
        }
 
        public boolean hasChildren(Object element) {
-               if (element instanceof RepositoriesNode) {
-                       RepositoryRegister rr = ((RepositoriesNode) element)
+               if (element instanceof RepositoriesElem) {
+                       RepositoryRegister rr = ((RepositoriesElem) element)
                                        .getRepositoryRegister();
                        return rr.getRepositories().size() > 0;
                } else if (element instanceof TreeParent) {