X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcontrollers%2FDistTreeContentProvider.java;h=b7e25d1ee47295433c29f481fdf36eb173307bfa;hb=e07ded4632e53f8b8869763bc1f1f4091361e76e;hp=0fc46d2f10cb111b7ee2ed4f98052d5f5e90ad7c;hpb=73ac105db209e2dc5dc42007a6682f12347a9bd5;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 0fc46d2f1..b7e25d1ee 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,12 +12,13 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.eclipse.ui.TreeParent; import org.argeo.jcr.JcrUtils; -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; @@ -44,7 +45,7 @@ public class DistTreeContentProvider implements ITreeContentProvider { try { if (nodeSession != null) dispose(); - nodeSession = nodeRepository.login(); + nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE); String reposPath = NodeUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH; @@ -56,7 +57,8 @@ public class DistTreeContentProvider implements ITreeContentProvider { 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(); + ? repoNode.getProperty(Property.JCR_TITLE).getString() + : repoNode.getName(); repositories.add(new RepoElem(repositoryFactory, keyring, repoNode, label)); } } @@ -106,7 +108,7 @@ public class DistTreeContentProvider implements ITreeContentProvider { throw new SlcException("User must be authenticated."); // make sure base directory is available - Node repos = JcrUtils.mkdirs(homeNode, RepoConstants.REPOSITORIES_BASE_PATH,null); + Node repos = JcrUtils.mkdirs(homeNode, RepoConstants.REPOSITORIES_BASE_PATH, null); if (nodeSession.hasPendingChanges()) nodeSession.save();