Author: mduerig
Date: Thu May 3 21:56:50 2012
New Revision: 1333647
URL: http://svn.apache.org/viewvc?rev=1333647&view=rev
Log:
OAK-84: Delegates for Session, Node, Property and Item
- added FIXME where casts to NodeImpl should be replaced with usages of
NodeDelegate
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/privileges/PrivilegeManagerImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.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/security/privileges/PrivilegeManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/privileges/PrivilegeManagerImpl.java?rev=1333647&r1=1333646&r2=1333647&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/privileges/PrivilegeManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/privileges/PrivilegeManagerImpl.java
Thu May 3 21:56:50 2012
@@ -96,6 +96,7 @@ public class PrivilegeManagerImpl implem
//--------------------------------------------------------------------------
private NodeImpl getPrivilegeRoot() throws RepositoryException {
+ // FIXME use NodeDelegate instead of NodeImpl
return (NodeImpl) sessionDelegate.getSession().getNode(PRIVILEGE_ROOT);
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.java?rev=1333647&r1=1333646&r2=1333647&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.java
Thu May 3 21:56:50 2012
@@ -55,7 +55,7 @@ abstract class AuthorizableImpl implemen
static final String REP_MEMBERS = "rep:members";
static final String REP_IMPERSONATORS = "rep:impersonators";
- private final NodeImpl node;
+ private final NodeImpl node; // FIXME use NodeDelegate instead of NodeImpl
private final UserManagerImpl userManager;
private int hashCode;
@@ -265,7 +265,7 @@ abstract class AuthorizableImpl implemen
public String toString() {
try {
String typeStr = (isGroup()) ? "Group '" : "User '";
- return new
StringBuilder().append(typeStr).append(getID()).append('\'').toString();
+ return typeStr + getID() + '\'';
} catch (RepositoryException e) {
return super.toString();
}
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=1333647&r1=1333646&r2=1333647&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
Thu May 3 21:56:50 2012
@@ -69,6 +69,7 @@ public class UserManagerImpl implements
public Authorizable getAuthorizable(String id) throws RepositoryException {
Authorizable authorizable = null;
try {
+ // FIXME use NodeDelegate instead od NodeImpl
NodeImpl node = (NodeImpl)
sessionDelegate.getSession().getNodeByIdentifier(buildIdentifier(id));
authorizable = getAuthorizable(node);
} catch (ItemNotFoundException e) {
