fixed minor problems in javadoc etc.

diff --git a/src/main/javassist/CtBehavior.java b/src/main/javassist/CtBehavior.java
index f82c0f2eb29601b8441808df939a298981f7a759..75af53b867fda5fdc09401b632869a22775c0826 100644 (file)
--- a/src/main/javassist/CtBehavior.java
+++ b/src/main/javassist/CtBehavior.java
@@ -159,20 +159,20 @@ public abstract class CtBehavior extends CtMember {
     }
 
     /**
-     * Returns true if the class has the specified annotation class.
+     * Returns true if the class has the specified annotation type.
      *
-     * @param clz the name of annotation class.
+     * @param typeName      the name of annotation type.
      * @return <code>true</code> if the annotation is found,
      *         otherwise <code>false</code>.
-     * @since 3.11
+     * @since 3.21
      */
-    public boolean hasAnnotation(String clz) {
+    public boolean hasAnnotation(String typeName) {
        MethodInfo mi = getMethodInfo2();
        AnnotationsAttribute ainfo = (AnnotationsAttribute)
                    mi.getAttribute(AnnotationsAttribute.invisibleTag);  
        AnnotationsAttribute ainfo2 = (AnnotationsAttribute)
                    mi.getAttribute(AnnotationsAttribute.visibleTag);  
-       return CtClassType.hasAnnotationType(clz,
+       return CtClassType.hasAnnotationType(typeName,
                                             getDeclaringClass().getClassPool(),
                                             ainfo, ainfo2);
     }

diff --git a/src/main/javassist/CtClass.java b/src/main/javassist/CtClass.java
index 8c39e37661d33564c57a658d6f0482e314e84ed2..8aafc4459db8adf766f6192d1f48755c14d0b020 100644 (file)
--- a/src/main/javassist/CtClass.java
+++ b/src/main/javassist/CtClass.java
@@ -582,35 +582,35 @@ public abstract class CtClass {
     }
 
     /**
-     * Returns true if the class has the specified annotation class.
+     * Returns true if the class has the specified annotation type.
      *
-     * @param clz the annotation class.
+     * @param annotationType the annotation type.
      * @return <code>true</code> if the annotation is found, otherwise <code>false</code>.
      * @since 3.11
      */
-    public boolean hasAnnotation(Class clz) {
-        return hasAnnotation(clz.getName());
+    public boolean hasAnnotation(Class annotationType) {
+        return hasAnnotation(annotationType.getName());
     }
 
     /**
-     * Returns true if the class has the specified annotation class.
+     * Returns true if the class has the specified annotation type.
      *
-     * @param annotClzName the name of annotation class.
+     * @param annotationTypeName the name of annotation type.
      * @return <code>true</code> if the annotation is found, otherwise <code>false</code>.
-     * @since 3.11
+     * @since 3.21
      */
-    public boolean hasAnnotation(String annotClzName) {
+    public boolean hasAnnotation(String annotationTypeName) {
         return false;
     }
 
     /**
-     * Returns the annotation if the class has the specified annotation class.
+     * Returns the annotation if the class has the specified annotation type.
      * For example, if an annotation <code>@Author</code> is associated
      * with this class, an <code>Author</code> object is returned.
      * The member values can be obtained by calling methods on
      * the <code>Author</code> object.
      *
-     * @param clz the annotation class.
+     * @param clz the annotation type.
      * @return the annotation if found, otherwise <code>null</code>.
      * @since 3.11
      */

diff --git a/src/main/javassist/CtClassType.java b/src/main/javassist/CtClassType.java
index cf171f09b81c4803924c35a23b32d38f87de64c4..3a0f2cd74b946473a79947bc1ad54b3f9172c8e7 100644 (file)
--- a/src/main/javassist/CtClassType.java
+++ b/src/main/javassist/CtClassType.java
@@ -452,15 +452,18 @@ class CtClassType extends CtClass {
     }
 
     //@Override
-    public boolean hasAnnotation(String annotClzName) {
+    public boolean hasAnnotation(String annotationName) {
         ClassFile cf = getClassFile2();
         AnnotationsAttribute ainfo = (AnnotationsAttribute)
                 cf.getAttribute(AnnotationsAttribute.invisibleTag);
         AnnotationsAttribute ainfo2 = (AnnotationsAttribute)
                 cf.getAttribute(AnnotationsAttribute.visibleTag);
-        return hasAnnotationType(annotClzName, getClassPool(), ainfo, ainfo2);
+        return hasAnnotationType(annotationName, getClassPool(), ainfo, ainfo2);
     }
 
+    /**
+     * @deprecated
+     */
     static boolean hasAnnotationType(Class clz, ClassPool cp,
                                      AnnotationsAttribute a1,
                                      AnnotationsAttribute a2)
@@ -468,7 +471,7 @@ class CtClassType extends CtClass {
         return hasAnnotationType(clz.getName(), cp, a1, a2);
     }
 
-    static boolean hasAnnotationType(String annotationClzNm, ClassPool cp,
+    static boolean hasAnnotationType(String annotationTypeName, ClassPool cp,
                                      AnnotationsAttribute a1,
                                      AnnotationsAttribute a2)
     {
@@ -484,16 +487,14 @@ class CtClassType extends CtClass {
         else
             anno2 = a2.getAnnotations();
 
-        //        String typeName = clz.getName();
-        String typeName = annotationClzNm;
         if (anno1 != null)
             for (int i = 0; i < anno1.length; i++)
-                if (anno1[i].getTypeName().equals(typeName))
+                if (anno1[i].getTypeName().equals(annotationTypeName))
                     return true;
 
         if (anno2 != null)
             for (int i = 0; i < anno2.length; i++)
-                if (anno2[i].getTypeName().equals(typeName))
+                if (anno2[i].getTypeName().equals(annotationTypeName))
                     return true;
 
         return false;

diff --git a/src/main/javassist/CtField.java b/src/main/javassist/CtField.java
index bf5125e25880a12bb7bf594338a89c97fa0d9899..76f64f2a1aa481cee99f5897ebd6975906752e12 100644 (file)
--- a/src/main/javassist/CtField.java
+++ b/src/main/javassist/CtField.java
@@ -242,19 +242,19 @@ public class CtField extends CtMember {
     }
 
     /**
-     * Returns true if the class has the specified annotation class.
+     * Returns true if the class has the specified annotation type.
      *
-     * @param clz the name of annotation class.
+     * @param typeName      the name of annotation type.
      * @return <code>true</code> if the annotation is found, otherwise <code>false</code>.
-     * @since 3.11
+     * @since 3.21
      */
-    public boolean hasAnnotation(String clz) {
+    public boolean hasAnnotation(String typeName) {
         FieldInfo fi = getFieldInfo2();
         AnnotationsAttribute ainfo = (AnnotationsAttribute)
                     fi.getAttribute(AnnotationsAttribute.invisibleTag);  
         AnnotationsAttribute ainfo2 = (AnnotationsAttribute)
                     fi.getAttribute(AnnotationsAttribute.visibleTag);  
-        return CtClassType.hasAnnotationType(clz, getDeclaringClass().getClassPool(),
+        return CtClassType.hasAnnotationType(typeName, getDeclaringClass().getClassPool(),
                                              ainfo, ainfo2);
     }
 

diff --git a/src/main/javassist/CtMember.java b/src/main/javassist/CtMember.java
index 63a26b56528e25ceab6b17cd215f3f2db1e97ac3..3c5da7686ad42a6cd94f1346435c17c2eff373e3 100644 (file)
--- a/src/main/javassist/CtMember.java
+++ b/src/main/javassist/CtMember.java
@@ -208,9 +208,9 @@ public abstract class CtMember {
     public abstract void setModifiers(int mod);
 
     /**
-     * Returns true if the class has the specified annotation class.
+     * Returns true if the class has the specified annotation type.
      *
-     * @param clz the annotation class.
+     * @param clz the annotation type.
      * @return <code>true</code> if the annotation is found, otherwise <code>false</code>.
      * @since 3.11
      */
@@ -219,26 +219,26 @@ public abstract class CtMember {
     }
 
     /**
-     * Returns true if the class has the specified annotation class.
+     * Returns true if the class has the specified annotation type.
      *
-     * @param annotClzName the name of annotation class.
+     * @param annotationTypeName the name of annotation type.
      * @return <code>true</code> if the annotation is found, otherwise <code>false</code>.
-     * @since 3.11
+     * @since 3.21
      */
-    public abstract boolean hasAnnotation(String annotClzName);
+    public abstract boolean hasAnnotation(String annotationTypeName);
 
     /**
-     * Returns the annotation if the class has the specified annotation class.
+     * Returns the annotation if the class has the specified annotation type.
      * For example, if an annotation <code>@Author</code> is associated
      * with this member, an <code>Author</code> object is returned.
      * The member values can be obtained by calling methods on
      * the <code>Author</code> object.
      *
-     * @param clz the annotation class.
+     * @param annotationType    the annotation type.
      * @return the annotation if found, otherwise <code>null</code>.
      * @since 3.11
      */
-    public abstract Object getAnnotation(Class clz) throws ClassNotFoundException;
+    public abstract Object getAnnotation(Class annotationType) throws ClassNotFoundException;
 
     /**
      * Returns the annotations associated with this member.