Refactor JCR utils and home usage

[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 4790649d259b12deee180356e478f458cf37fe4b..a1aca2b20ca3e608612e08184a1adcae67b92206 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 Mathieu Baudier
+ *
+ * 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;
@@ -5,11 +20,12 @@ import java.util.Arrays;
 import java.util.List;
 
 import javax.jcr.Node;
+import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.jcr.ArgeoJcrConstants;
-import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.ArgeoJcrUtils;
 import org.argeo.jcr.RepositoryRegister;
 import org.argeo.jcr.security.JcrKeyring;
 import org.argeo.jcr.ui.explorer.model.RepositoriesNode;
@@ -29,6 +45,7 @@ public class NodeContentProvider implements ITreeContentProvider {
 
        // Business Objects
        final private RepositoryRegister repositoryRegister;
+       final private RepositoryFactory repositoryFactory;
        final private Session userSession;
        final private JcrKeyring jcrKeyring;
        final private boolean sortChildren;
@@ -41,10 +58,12 @@ public class NodeContentProvider implements ITreeContentProvider {
        private TreeObjectsComparator itemComparator = new TreeObjectsComparator();
 
        public NodeContentProvider(JcrKeyring jcrKeyring,
-                       RepositoryRegister repositoryRegister, Boolean sortChildren) {
+                       RepositoryRegister repositoryRegister,
+                       RepositoryFactory repositoryFactory, Boolean sortChildren) {
                this.userSession = jcrKeyring != null ? jcrKeyring.getSession() : null;
                this.jcrKeyring = jcrKeyring;
                this.repositoryRegister = repositoryRegister;
+               this.repositoryFactory = repositoryFactory;
                this.sortChildren = sortChildren;
        }
 
@@ -53,7 +72,7 @@ public class NodeContentProvider implements ITreeContentProvider {
                        return;
 
                if (userSession != null) {
-                       Node userHome = JcrUtils.getUserHome(userSession);
+                       Node userHome = ArgeoJcrUtils.getUserHome(userSession);
                        if (userHome != null) {
                                // TODO : find a way to dynamically get alias for the node
                                if (homeNode != null)
@@ -66,7 +85,7 @@ public class NodeContentProvider implements ITreeContentProvider {
                        if (repositoriesNode != null)
                                repositoriesNode.dispose();
                        repositoriesNode = new RepositoriesNode("Repositories",
-                                       repositoryRegister, null, jcrKeyring);
+                                       repositoryRegister, repositoryFactory, null, jcrKeyring);
                }
        }