X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcontrollers%2FDistTreeContentProvider.java;h=0fc46d2f10cb111b7ee2ed4f98052d5f5e90ad7c;hb=d154e9f68017e8c5a8edac15475b2d79aea3e9d4;hp=6eea82f3f3036dc2fac7e18f01a760dcdc493e37;hpb=ee53b65ba03c7b927a7768325b9bfc6f8185965f;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
index 6eea82f3f..0fc46d2f1 100644
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
@@ -12,16 +12,15 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
+import org.argeo.cms.ArgeoNames;
+import org.argeo.cms.ArgeoTypes;
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.jcr.ArgeoJcrUtils;
-import org.argeo.jcr.ArgeoNames;
-import org.argeo.jcr.ArgeoTypes;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.UserJcrUtils;
+import org.argeo.node.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.model.RepoElem;
 import org.argeo.slc.repo.RepoConstants;
-import org.argeo.util.security.Keyring;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
@@ -47,8 +46,7 @@ public class DistTreeContentProvider implements ITreeContentProvider {
 				dispose();
 			nodeSession = nodeRepository.login();
 
-			String reposPath = UserJcrUtils.getUserHome(nodeSession).getPath()
-					+ RepoConstants.REPOSITORIES_BASE_PATH;
+			String reposPath = NodeUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
 
 			if (!nodeSession.itemExists(reposPath))
 				initializeModel(nodeSession);
@@ -57,11 +55,9 @@ public class DistTreeContentProvider implements ITreeContentProvider {
 			while (repos.hasNext()) {
 				Node repoNode = repos.nextNode();
 				if (repoNode.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) {
-					String label = repoNode.isNodeType(NodeType.MIX_TITLE) ? repoNode
-							.getProperty(Property.JCR_TITLE).getString()
-							: repoNode.getName();
-					repositories.add(new RepoElem(repositoryFactory, keyring,
-							repoNode, label));
+					String label = repoNode.isNodeType(NodeType.MIX_TITLE)
+							? repoNode.getProperty(Property.JCR_TITLE).getString() : repoNode.getName();
+					repositories.add(new RepoElem(repositoryFactory, keyring, repoNode, label));
 				}
 			}
 		} catch (RepositoryException e) {
@@ -105,28 +101,24 @@ public class DistTreeContentProvider implements ITreeContentProvider {
 
 	private void initializeModel(Session nodeSession) {
 		try {
-			Node homeNode = UserJcrUtils.getUserHome(nodeSession);
+			Node homeNode = NodeUtils.getUserHome(nodeSession);
 			if (homeNode == null) // anonymous
 				throw new SlcException("User must be authenticated.");
 
 			// make sure base directory is available
-			Node repos = JcrUtils.mkdirs(nodeSession, homeNode.getPath()
-					+ RepoConstants.REPOSITORIES_BASE_PATH);
+			Node repos = JcrUtils.mkdirs(homeNode, RepoConstants.REPOSITORIES_BASE_PATH,null);
 			if (nodeSession.hasPendingChanges())
 				nodeSession.save();
 
 			// register default local java repository
 			String alias = RepoConstants.DEFAULT_JAVA_REPOSITORY_ALIAS;
-			Repository javaRepository = ArgeoJcrUtils.getRepositoryByAlias(
-					repositoryFactory, alias);
+			Repository javaRepository = NodeUtils.getRepositoryByAlias(repositoryFactory, alias);
 			if (javaRepository != null) {
 				if (!repos.hasNode(alias)) {
-					Node repoNode = repos.addNode(alias,
-							ArgeoTypes.ARGEO_REMOTE_REPOSITORY);
+					Node repoNode = repos.addNode(alias, ArgeoTypes.ARGEO_REMOTE_REPOSITORY);
 					repoNode.setProperty(ArgeoNames.ARGEO_URI, "vm:///" + alias);
 					repoNode.addMixin(NodeType.MIX_TITLE);
-					repoNode.setProperty(Property.JCR_TITLE,
-							RepoConstants.DEFAULT_JAVA_REPOSITORY_LABEL);
+					repoNode.setProperty(Property.JCR_TITLE, RepoConstants.DEFAULT_JAVA_REPOSITORY_LABEL);
 					nodeSession.save();
 				}
 			}