diff --git a/core-tiger/src/main/java/org/springframework/security/annotation/Jsr250MethodDefinitionSource.java b/core-tiger/src/main/java/org/springframework/security/annotation/Jsr250MethodDefinitionSource.java index 745632998c..d30425910b 100644 --- a/core-tiger/src/main/java/org/springframework/security/annotation/Jsr250MethodDefinitionSource.java +++ b/core-tiger/src/main/java/org/springframework/security/annotation/Jsr250MethodDefinitionSource.java @@ -35,6 +35,7 @@ import org.springframework.security.intercept.method.AbstractFallbackMethodDefin * * @author Ben Alex * @version $Id$ + * @since 2.0 */ public class Jsr250MethodDefinitionSource extends AbstractFallbackMethodDefinitionSource { diff --git a/core/src/main/java/org/springframework/security/intercept/method/AbstractFallbackMethodDefinitionSource.java b/core/src/main/java/org/springframework/security/intercept/method/AbstractFallbackMethodDefinitionSource.java index 4997c2c451..f7d573df11 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/AbstractFallbackMethodDefinitionSource.java +++ b/core/src/main/java/org/springframework/security/intercept/method/AbstractFallbackMethodDefinitionSource.java @@ -34,6 +34,7 @@ import org.springframework.util.ObjectUtils; * * @author Ben Alex * @version $Id$ + * @since 2.0 */ public abstract class AbstractFallbackMethodDefinitionSource implements MethodDefinitionSource { @@ -144,7 +145,7 @@ public abstract class AbstractFallbackMethodDefinitionSource implements MethodDe * Note that the {@link Method#getDeclaringClass()} may not equal the targetClass. * Both parameters are provided to assist subclasses which may wish to provide advanced * capabilities related to method metadata being "registered" against a method even if the - * target class does not declare the method (ie the subclass may only inherit the method). + * target class does not declare the method (i.e. the subclass may only inherit the method). * * @param method the method for the current invocation (never null) * @param targetClass the target class for the invocation (may be null) @@ -195,6 +196,6 @@ public abstract class AbstractFallbackMethodDefinitionSource implements MethodDe public String toString() { return "CacheKey[" + (targetClass == null ? "-" : targetClass.getName()) + "; " + method + "]"; } -} + } } diff --git a/core/src/main/java/org/springframework/security/intercept/method/AbstractMethodDefinitionSource.java b/core/src/main/java/org/springframework/security/intercept/method/AbstractMethodDefinitionSource.java index ad4b7df7ee..9660186420 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/AbstractMethodDefinitionSource.java +++ b/core/src/main/java/org/springframework/security/intercept/method/AbstractMethodDefinitionSource.java @@ -31,7 +31,7 @@ import java.lang.reflect.Method; /** - * Abstract implementation of MethodDefinitionSource. + * Abstract implementation of MethodDefinitionSource. * * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/springframework/security/intercept/method/MapBasedMethodDefinitionSource.java b/core/src/main/java/org/springframework/security/intercept/method/MapBasedMethodDefinitionSource.java index d9bda9ff7f..35f458cd94 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/MapBasedMethodDefinitionSource.java +++ b/core/src/main/java/org/springframework/security/intercept/method/MapBasedMethodDefinitionSource.java @@ -42,7 +42,8 @@ import org.springframework.util.ClassUtils; *

* * @author Ben Alex - * @version $Id: MethodDefinitionMap.java 2558 2008-01-30 15:43:40Z luke_t $ + * @version $Id$ + * @since 2.0 */ public class MapBasedMethodDefinitionSource extends AbstractFallbackMethodDefinitionSource implements BeanClassLoaderAware { //~ Static fields/initializers ===================================================================================== @@ -217,7 +218,7 @@ public class MapBasedMethodDefinitionSource extends AbstractFallbackMethodDefini protected ConfigAttributeDefinition lookupAttributes(Method method) { List attributesToReturn = new ArrayList(); - // Add attributes explictly defined for this method invocation + // Add attributes explicitly defined for this method invocation merge(attributesToReturn, (ConfigAttributeDefinition) this.methodMap.get(method)); // Add attributes explicitly defined for this method invocation's interfaces @@ -268,8 +269,8 @@ public class MapBasedMethodDefinitionSource extends AbstractFallbackMethodDefini /** * Stores both the Java Method as well as the Class we obtained the Method from. This is necessary because Method only * provides us access to the declaring class. It doesn't provide a way for us to introspect which Class the Method - * was registered against. If a given Class inherits and redeclares a method (ie calls super();) the registered Class - * and delcaring Class are the same. If a given class merely inherits but does not redeclare a method, the registered + * was registered against. If a given Class inherits and redeclares a method (i.e. calls super();) the registered Class + * and declaring Class are the same. If a given class merely inherits but does not redeclare a method, the registered * Class will be the Class we're invoking against and the Method will provide details of the declared class. */ private class RegisteredMethod {