You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2014/01/10 11:44:14 UTC
svn commit: r1557076 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security:
privilege/PrivilegeBits.java user/UserConstants.java
Author: angela
Date: Fri Jan 10 10:44:14 2014
New Revision: 1557076
URL: http://svn.apache.org/r1557076
Log:
minor improvement
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java?rev=1557076&r1=1557075&r2=1557076&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java Fri Jan 10 10:44:14 2014
@@ -505,10 +505,9 @@ public final class PrivilegeBits impleme
* </pre>
* @param bits the super set of bits
* @param otherBits the bits to check against
- * @return <code>true</code> if all other bits are included in bits.
+ * @return {@code true} if all other bits are included in bits.
*/
static boolean includes(long bits, long otherBits) {
- // todo: different check as 'and' check below. which one is faster?
return (bits | ~otherBits) == -1;
}
@@ -523,7 +522,7 @@ public final class PrivilegeBits impleme
* </pre>
* @param bits the super set of bits
* @param otherBits the bits to check against
- * @return <code>true</code> if all other bits are included in bits.
+ * @return {@code true} if all other bits are included in bits.
*/
static boolean includes(long[] bits, long[] otherBits) {
if (otherBits.length <= bits.length) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java?rev=1557076&r1=1557075&r2=1557076&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java Fri Jan 10 10:44:14 2014
@@ -61,14 +61,6 @@ public interface UserConstants {
);
/**
- * TODO: remove?
- */
- Collection<String> NODE_TYPE_NAMES = ImmutableSet.of(
- NT_REP_AUTHORIZABLE, NT_REP_USER, NT_REP_GROUP, NT_REP_MEMBERS,
- NT_REP_MEMBER_REFERENCES, NT_REP_MEMBER_REFERENCES_LIST
- );
-
- /**
* Configuration option defining the ID of the administrator user.
*/
String PARAM_ADMIN_ID = "adminId";