svn commit: r1532818 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java

[angela]

Author: angela
Date: Wed Oct 16 17:12:36 2013
New Revision: 1532818

URL: http://svn.apache.org/r1532818
Log:
OAK-527: permissions (wip, consistent naming)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java?rev=1532818&r1=1532817&r2=1532818&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java
 Wed Oct 16 17:12:36 2013
@@ -105,12 +105,12 @@ class PermissionStore implements Permiss
             if (parent.hasChild(name)) {
                 Tree child = parent.getChild(name);
                 if (PermissionUtil.checkACLPath(child, path)) {
-                    loadPermissionsFromTree(path, ret, child, 
restrictionProvider);
+                    loadPermissionEntries(path, ret, child, 
restrictionProvider);
                 } else {
                     // check for child node
                     for (Tree node : child.getChildren()) {
                         if (PermissionUtil.checkACLPath(node, path)) {
-                            loadPermissionsFromTree(path, ret, node, 
restrictionProvider);
+                            loadPermissionEntries(path, ret, node, 
restrictionProvider);
                         }
                     }
                 }
@@ -148,10 +148,10 @@ class PermissionStore implements Permiss
         }
     }
 
-    private static void loadPermissionsFromTree(@Nonnull String path,
-                                                @Nonnull 
Collection<PermissionEntry> ret,
-                                                @Nonnull Tree tree,
-                                                @Nonnull RestrictionProvider 
restrictionProvider) {
+    private static void loadPermissionEntries(@Nonnull String path,
+                                              @Nonnull 
Collection<PermissionEntry> ret,
+                                              @Nonnull Tree tree,
+                                              @Nonnull RestrictionProvider 
restrictionProvider) {
         for (Tree ace : tree.getChildren()) {
             if (ace.getName().charAt(0) != 'c') {
                 ret.add(new PermissionEntry(path, ace, restrictionProvider));