Author: angela
Date: Thu Aug 12 12:36:22 2010
New Revision: 984743
URL: http://svn.apache.org/viewvc?rev=984743&view=rev
Log:
reformat coding style back to default
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java?rev=984743&r1=984742&r2=984743&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/MembershipCache.java
Thu Aug 12 12:36:22 2010
@@ -79,8 +79,8 @@ public class MembershipCache implements
}
//------------------------------------------------------------< private >---
+
/**
- *
* @param authorizableNodeIdentifier
* @return
* @throws RepositoryException
@@ -118,7 +118,7 @@ public class MembershipCache implements
}
private Collection<String> collectDeclaredMembershipFromReferences(String authorizableNodeIdentifier,
- Session session) throws RepositoryException {
+ Session session) throws
RepositoryException {
Set<String> pIds = new HashSet<String>();
Set<String> nIds = new HashSet<String>();
@@ -138,8 +138,7 @@ public class MembershipCache implements
if (P_MEMBERS.equals(pMember.getQName())) {
// Found membership information in members property
groupNodeIdentifiers = pIds;
- }
- else {
+ } else {
// Found membership information in members node
groupNodeIdentifiers = nIds;
while (nGroup.isNodeType(NT_REP_MEMBERS)) {
@@ -189,8 +188,7 @@ public class MembershipCache implements
pIds.add(nGroup.getIdentifier());
}
}
- }
- else {
+ } else {
// Found membership information in members node
while (nGroup.isNodeType(NT_REP_MEMBERS)) {
nGroup = (NodeImpl) nGroup.getParent();
@@ -220,6 +218,7 @@ public class MembershipCache implements
* to use the members property or the members node to record membership
* information. If both sets are non empty, the one configured in the
* settings will take precedence and an warning is logged.
+ *
* @return
*/
private Set<String> select(Set<String> pIds, Set<String> nIds) {
@@ -227,16 +226,13 @@ public class MembershipCache implements
if (useMembersNode) {
if (!nIds.isEmpty() || pIds.isEmpty()) {
result = nIds;
- }
- else {
+ } else {
result = pIds;
}
- }
- else {
+ } else {
if (!pIds.isEmpty() || nIds.isEmpty()) {
result = pIds;
- }
- else {
+ } else {
result = nIds;
}
}
@@ -265,7 +261,7 @@ public class MembershipCache implements
}
private static PropertyIterator getMembershipReferences(String authorizableNodeIdentifier,
- Session session) {
+ Session session) {
PropertyIterator refs = null;
try {
|