svn commit: r1331387 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr: NodeDelegate.java PropertyDelegate.java SessionContext.java SessionImpl.java

[md...@apache.org]

Author: mduerig
Date: Fri Apr 27 12:28:15 2012
New Revision: 1331387

URL: http://svn.apache.org/viewvc?rev=1331387&view=rev
Log:
rename branch to root (leftovers from earlier rename)

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
    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

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java?rev=1331387&r1=1331386&r2=1331387&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java Fri Apr 27 12:28:15 2012
@@ -43,7 +43,7 @@ public class NodeDelegate extends ItemDe
 
     NodeDelegate addNode(String relPath) throws RepositoryException {
         String parentPath = Paths.concat(getPath(), Paths.getParentPath(relPath));
-        Tree parentState = getBranch().getTree(parentPath);
+        Tree parentState = getRoot().getTree(parentPath);
         if (parentState == null) {
             throw new PathNotFoundException(relPath);
         }
@@ -90,7 +90,7 @@ public class NodeDelegate extends ItemDe
 
     NodeDelegate getNodeOrNull(String relOakPath) {
         String absPath = Paths.concat(getPath(), relOakPath);
-        Tree tree = getBranch().getTree(absPath);
+        Tree tree = getRoot().getTree(absPath);
         return tree == null ? null : new NodeDelegate(sessionContext, tree);
     }
 
@@ -120,7 +120,7 @@ public class NodeDelegate extends ItemDe
 
         String absPath = Paths.concat(getPath(),
                 Paths.getParentPath(relOakPath));
-        Tree parent = getBranch().getTree(absPath);
+        Tree parent = getRoot().getTree(absPath);
         if (parent == null) {
             return null;
         }
@@ -155,8 +155,8 @@ public class NodeDelegate extends ItemDe
 
     // ------------------------------------------------------------< private >---
 
-    private Root getBranch() {
-        return sessionContext.getBranch();
+    private Root getRoot() {
+        return sessionContext.getRoot();
     }
 
     private Tree getState() {
@@ -164,7 +164,7 @@ public class NodeDelegate extends ItemDe
     }
 
     private synchronized Tree getTree() {
-        return tree = getBranch().getTree(tree.getPath());
+        return tree = getRoot().getTree(tree.getPath());
     }
 
     private Iterator<NodeDelegate> nodeDelegateIterator(

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java?rev=1331387&r1=1331386&r2=1331387&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java Fri Apr 27 12:28:15 2012
@@ -167,7 +167,7 @@ public class PropertyDelegate extends It
     //------------------------------------------------------------< private >---
 
     private Root getBranch() {
-        return sessionContext.getBranch();
+        return sessionContext.getRoot();
     }
 
     private synchronized void resolve() {

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=1331387&r1=1331386&r2=1331387&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:28:15 2012
@@ -37,7 +37,7 @@ public interface SessionContext {
     NameMapper getNameMapper();
     LockManager getLockManager() throws RepositoryException;
     VersionManager getVersionManager() throws RepositoryException;
-    Root getBranch();
+    Root getRoot();
     Tree getContentTree(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=1331387&r1=1331386&r2=1331387&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:28:15 2012
@@ -527,7 +527,7 @@ public class SessionImpl extends Abstrac
         }
 
         @Override
-        public Root getBranch() {
+        public Root getRoot() {
             return root;
         }