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 md...@apache.org on 2013/02/15 00:15:15 UTC

svn commit: r1446387 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege: PrivilegeBits.java PrivilegeMigrator.java

Author: mduerig
Date: Thu Feb 14 23:15:15 2013
New Revision: 1446387

URL: http://svn.apache.org/r1446387
Log:
typos

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeBits.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeMigrator.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeBits.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeBits.java?rev=1446387&r1=1446386&r2=1446387&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeBits.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeBits.java Thu Feb 14 23:15:15 2013
@@ -18,8 +18,8 @@ package org.apache.jackrabbit.oak.securi
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -391,7 +391,7 @@ public final class PrivilegeBits impleme
      * If {@code this} is included in {@code other} {@link #EMPTY empty}
      * privilege bits is returned.
      *
-     * @param other The other privilege bits to be substracted from this instance.
+     * @param other The other privilege bits to be subtracted from this instance.
      * @return The updated instance.
      * @throws UnsupportedOperationException if this instance is immutable.
      */

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeMigrator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeMigrator.java?rev=1446387&r1=1446386&r2=1446387&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeMigrator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeMigrator.java Thu Feb 14 23:15:15 2013
@@ -75,7 +75,7 @@ public class PrivilegeMigrator {
                     return root.getTree("/");
                 }
             };
-            for (PrivilegeDefinition def : readCustomDefinitons(privilegeStream, nsRegistry)) {
+            for (PrivilegeDefinition def : readCustomDefinitions(privilegeStream, nsRegistry)) {
                 store.writeDefinition(def);
             }
         } catch (IOException e) {
@@ -95,8 +95,8 @@ public class PrivilegeMigrator {
      * @throws RepositoryException
      * @throws IOException
      */
-    private static Iterable<PrivilegeDefinition> readCustomDefinitons(InputStream customPrivileges,
-                                                                      NamespaceRegistry nsRegistry) throws RepositoryException, IOException {
+    private static Iterable<PrivilegeDefinition> readCustomDefinitions(InputStream customPrivileges,
+            NamespaceRegistry nsRegistry) throws RepositoryException, IOException {
         Map<String, PrivilegeDefinition> definitions = new LinkedHashMap<String, PrivilegeDefinition>();
         InputSource src = new InputSource(customPrivileges);
         for (PrivilegeDefinition def : PrivilegeXmlHandler.readDefinitions(src, nsRegistry)) {