X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=legacy%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcontrollers%2FDistTreeContentProvider.java;fp=legacy%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcontrollers%2FDistTreeContentProvider.java;h=c2e9a8e4879994819dcce2071be346d8ac6896e1;hb=4316ea22964732db743118a1d319ab5ed2ac6a79;hp=b7e25d1ee47295433c29f481fdf36eb173307bfa;hpb=2728afed20a95052f93c41ec641808ec5f01f4fb;p=gpl%2Fargeo-slc.git diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java index b7e25d1ee..c2e9a8e48 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java @@ -13,10 +13,10 @@ 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.cms.jcr.CmsJcrUtils; import org.argeo.eclipse.ui.TreeParent; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; @@ -47,7 +47,7 @@ public class DistTreeContentProvider implements ITreeContentProvider { dispose(); nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE); - String reposPath = NodeUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH; + String reposPath = CmsJcrUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH; if (!nodeSession.itemExists(reposPath)) initializeModel(nodeSession); @@ -103,7 +103,7 @@ public class DistTreeContentProvider implements ITreeContentProvider { private void initializeModel(Session nodeSession) { try { - Node homeNode = NodeUtils.getUserHome(nodeSession); + Node homeNode = CmsJcrUtils.getUserHome(nodeSession); if (homeNode == null) // anonymous throw new SlcException("User must be authenticated."); @@ -114,7 +114,7 @@ public class DistTreeContentProvider implements ITreeContentProvider { // register default local java repository String alias = RepoConstants.DEFAULT_JAVA_REPOSITORY_ALIAS; - Repository javaRepository = NodeUtils.getRepositoryByAlias(repositoryFactory, alias); + Repository javaRepository = CmsJcrUtils.getRepositoryByAlias(repositoryFactory, alias); if (javaRepository != null) { if (!repos.hasNode(alias)) { Node repoNode = repos.addNode(alias, ArgeoTypes.ARGEO_REMOTE_REPOSITORY);