svn commit: r1331390 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr: SessionContext.java SessionImpl.java security/user/UserManagerImpl.java

[mduerig]

Author: mduerig
Date: Fri Apr 27 12:30:22 2012
New Revision: 1331390

URL: http://svn.apache.org/viewvc?rev=1331390&view=rev
Log:
OAK-29: Simplify SessionContext
rename getContentTree() to getTree() to match class name

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java?rev=1331390&r1=1331389&r2=1331390&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
 Fri Apr 27 12:30:22 2012
@@ -38,7 +38,7 @@ public interface SessionContext {
     LockManager getLockManager() throws RepositoryException;
     VersionManager getVersionManager() throws RepositoryException;
     Root getRoot();
-    Tree getContentTree(String path);
+    Tree getTree(String path);
     String toOakPath(String jcrPath) throws RepositoryException;
     String toJcrPath(String oakPath);
 }

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java?rev=1331390&r1=1331389&r2=1331390&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
 Fri Apr 27 12:30:22 2012
@@ -532,7 +532,7 @@ public class SessionImpl extends Abstrac
         }
 
         @Override
-        public Tree getContentTree(String oakPath) {
+        public Tree getTree(String oakPath) {
             return root.getTree(oakPath);
         }
 

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java?rev=1331390&r1=1331389&r2=1331390&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java
 Fri Apr 27 12:30:22 2012
@@ -327,16 +327,16 @@ public class UserManagerImpl implements 
 
     void setInternalProperty(NodeImpl userNode, String name, String value, int 
type) throws RepositoryException {
         CoreValue cv = ValueConverter.toCoreValue(value, type, sessionContext);
-        sessionContext.getContentTree(userNode.getOakPath()).setProperty(name, 
cv);
+        sessionContext.getTree(userNode.getOakPath()).setProperty(name, cv);
     }
 
     void setInternalProperty(NodeImpl userNode, String name, String[] values, 
int type) throws RepositoryException {
         List<CoreValue> cvs = ValueConverter.toCoreValues(values, type, 
sessionContext);
-        sessionContext.getContentTree(userNode.getOakPath()).setProperty(name, 
cvs);
+        sessionContext.getTree(userNode.getOakPath()).setProperty(name, cvs);
     }
 
     void removeInternalProperty(NodeImpl userNode, String name) {
-        
sessionContext.getContentTree(userNode.getOakPath()).removeProperty(name);
+        sessionContext.getTree(userNode.getOakPath()).removeProperty(name);
     }
 
     private Authorizable getAuthorizable(NodeImpl node) throws 
RepositoryException {