Author: nickarls Date: 2008-11-28 03:20:56 -0500 (Fri, 28 Nov 2008) New Revision: 377 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedItemImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java Log: Umm. Commenting out the toStrings until checked which can call super.toString etc without looping. Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2008-11-28 08:20:56 UTC (rev 377) @@ -445,15 +445,15 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AbstractAnnotatedItem:\n"); - buffer.append("Annotations: " + getAnnotations().size() + "\n"); - int i = 0; - for (Annotation annotation : getAnnotations()) - { - buffer.append(++i + " - " + annotation.toString() + "\n"); - } - buffer.append(annotationMap == null ? "" : (annotationMap.toString() + "\n")); - buffer.append(metaAnnotationMap == null ? "" : (metaAnnotationMap.toString()) + "\n"); +// buffer.append("AbstractAnnotatedItem:\n"); +// buffer.append("Annotations: " + getAnnotations().size() + "\n"); +// int i = 0; +// for (Annotation annotation : getAnnotations()) +// { +// buffer.append(++i + " - " + annotation.toString() + "\n"); +// } +// buffer.append(annotationMap == null ? "" : (annotationMap.toString() + "\n")); +// buffer.append(metaAnnotationMap == null ? "" : (metaAnnotationMap.toString()) + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2008-11-28 08:20:56 UTC (rev 377) @@ -106,11 +106,11 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AbstractAnnotatedMember:\n"); - buffer.append(super.toString() + "\n"); - buffer.append("Final: " + isFinal() + "\n"); - buffer.append("Static: " + isStatic() + "\n"); - buffer.append("Name: " + getName() + "\n"); +// buffer.append("AbstractAnnotatedMember:\n"); +// buffer.append(super.toString() + "\n"); +// buffer.append("Final: " + isFinal() + "\n"); +// buffer.append("Static: " + isStatic() + "\n"); +// buffer.append("Name: " + getName() + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2008-11-28 08:20:56 UTC (rev 377) @@ -102,12 +102,12 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AbstractAnnotatedType:\n"); - buffer.append(super.toString() + "\n"); - buffer.append("Superclass: " + superclass.toString() + "\n"); - buffer.append("Name: " + getName() + "\n"); - buffer.append("Final: " + isFinal() + "\n"); - buffer.append("Static: " + isStatic() + "\n"); +// buffer.append("AbstractAnnotatedType:\n"); +// buffer.append(super.toString() + "\n"); +// buffer.append("Superclass: " + (superclass == null ? "" : superclass.toString()) + "\n"); +// buffer.append("Name: " + getName() + "\n"); +// buffer.append("Final: " + isFinal() + "\n"); +// buffer.append("Static: " + isStatic() + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2008-11-28 08:20:56 UTC (rev 377) @@ -227,17 +227,17 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AnnotatedConstructorImpl:\n"); - buffer.append(super.toString() + "\n"); - buffer.append("Class: " + clazz.toString() + "\n"); - - buffer.append("Members: " + getMembers().size() + "\n"); - int i = 0; - for (AnnotatedMethod<?> member : getMembers()) - { - buffer.append(++i + " - " + member.toString()); - } - buffer.append(annotatedMembers == null ? "" : (annotatedMembers.toString() + "\n")); +// buffer.append("AnnotatedConstructorImpl:\n"); +// buffer.append(super.toString() + "\n"); +// buffer.append("Class: " + clazz.toString() + "\n"); +// +// buffer.append("Members: " + getMembers().size() + "\n"); +// int i = 0; +// for (AnnotatedMethod<?> member : getMembers()) +// { +// buffer.append(++i + " - " + member.toString()); +// } +// buffer.append(annotatedMembers == null ? "" : (annotatedMembers.toString() + "\n")); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2008-11-28 08:20:56 UTC (rev 377) @@ -653,38 +653,38 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AnnotatedConstructorImpl:\n"); - buffer.append(super.toString() + "\n"); - buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); - int i = 0; - for (Type actualTypeArgument : actualTypeArguments) - { - buffer.append(++i + " - " + actualTypeArgument.toString()); - } - buffer.append("Class: " + clazz.toString() + "\n"); - buffer.append("Fields: " + getFields().size() + "\n"); - i = 0; - for (AnnotatedField<Object> field : getFields()) - { - buffer.append(++i + " - " + field.toString()); - } - buffer.append("Methods: " + methods.size() + "\n"); - i = 0; - for (AnnotatedMethod<Object> method : methods) - { - buffer.append(++i + " - " + method.toString()); - } - buffer.append("Constructors: " + methods.size() + "\n"); - i = 0; - for (AnnotatedConstructor<T> constructor : getConstructors()) - { - buffer.append(++i + " - " + constructor.toString()); - } - buffer.append(annotatedConstructors == null ? "" : (annotatedConstructors.toString() + "\n")); - buffer.append(annotatedFields == null ? "" : (annotatedFields.toString() + "\n")); - buffer.append(annotatedMethods == null ? "" : (annotatedMethods.toString() + "\n")); - buffer.append(constructorsByArgumentMap == null ? "" : (constructorsByArgumentMap.toString() + "\n")); - buffer.append(metaAnnotatedFields == null ? "" : (metaAnnotatedFields.toString() + "\n")); +// buffer.append("AnnotatedConstructorImpl:\n"); +// buffer.append(super.toString() + "\n"); +// buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); +// int i = 0; +// for (Type actualTypeArgument : actualTypeArguments) +// { +// buffer.append(++i + " - " + actualTypeArgument.toString()); +// } +// buffer.append("Class: " + clazz.toString() + "\n"); +// buffer.append("Fields: " + getFields().size() + "\n"); +// i = 0; +// for (AnnotatedField<Object> field : getFields()) +// { +// buffer.append(++i + " - " + field.toString()); +// } +// buffer.append("Methods: " + methods.size() + "\n"); +// i = 0; +// for (AnnotatedMethod<Object> method : methods) +// { +// buffer.append(++i + " - " + method.toString()); +// } +// buffer.append("Constructors: " + methods.size() + "\n"); +// i = 0; +// for (AnnotatedConstructor<T> constructor : getConstructors()) +// { +// buffer.append(++i + " - " + constructor.toString()); +// } +// buffer.append(annotatedConstructors == null ? "" : (annotatedConstructors.toString() + "\n")); +// buffer.append(annotatedFields == null ? "" : (annotatedFields.toString() + "\n")); +// buffer.append(annotatedMethods == null ? "" : (annotatedMethods.toString() + "\n")); +// buffer.append(constructorsByArgumentMap == null ? "" : (constructorsByArgumentMap.toString() + "\n")); +// buffer.append(metaAnnotatedFields == null ? "" : (metaAnnotatedFields.toString() + "\n")); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2008-11-28 08:20:56 UTC (rev 377) @@ -354,25 +354,25 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AnnotatedConstructorImpl:\n"); - buffer.append(super.toString() + "\n"); - buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); - int i = 0; - for (Type actualTypeArgument : actualTypeArguments) - { - buffer.append(++i + " - " + actualTypeArgument.toString()); - } - buffer.append("Declaring class:\n"); - buffer.append(declaringClass.toString() + "\n"); - buffer.append("Constructor:\n"); - buffer.append(constructor.toString() + "\n"); - buffer.append("Parameters: " + getParameters().size() + "\n"); - i = 0; - for (AnnotatedParameter<?> parameter : getParameters()) - { - buffer.append(++i + " - " + parameter.toString()); - } - buffer.append(annotatedParameters.toString() + "\n"); +// buffer.append("AnnotatedConstructorImpl:\n"); +// buffer.append(super.toString() + "\n"); +// buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); +// int i = 0; +// for (Type actualTypeArgument : actualTypeArguments) +// { +// buffer.append(++i + " - " + actualTypeArgument.toString()); +// } +// buffer.append("Declaring class:\n"); +// buffer.append(declaringClass.toString() + "\n"); +// buffer.append("Constructor:\n"); +// buffer.append(constructor.toString() + "\n"); +// buffer.append("Parameters: " + getParameters().size() + "\n"); +// i = 0; +// for (AnnotatedParameter<?> parameter : getParameters()) +// { +// buffer.append(++i + " - " + parameter.toString()); +// } +// buffer.append(annotatedParameters.toString() + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2008-11-28 08:20:56 UTC (rev 377) @@ -146,17 +146,17 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AnnotatedFieldImpl:\n"); - buffer.append(super.toString() + "\n"); - buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); - int i = 0; - for (Type actualTypeArgument : actualTypeArguments) - { - buffer.append(++i + " - " + actualTypeArgument.toString()); - } - buffer.append("Declaring class:\n"); - buffer.append(declaringClass.toString() + "\n"); - buffer.append("Field: " + field + "\n"); +// buffer.append("AnnotatedFieldImpl:\n"); +// buffer.append(super.toString() + "\n"); +// buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); +// int i = 0; +// for (Type actualTypeArgument : actualTypeArguments) +// { +// buffer.append(++i + " - " + actualTypeArgument.toString()); +// } +// buffer.append("Declaring class:\n"); +// buffer.append(declaringClass.toString() + "\n"); +// buffer.append("Field: " + field + "\n"); return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedItemImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedItemImpl.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedItemImpl.java 2008-11-28 08:20:56 UTC (rev 377) @@ -236,20 +236,20 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AnnotatedItemImpl:\n"); - buffer.append(super.toString() + "\n"); - buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); - int i = 0; - for (Type actualTypeArgument : actualTypeArguments) - { - buffer.append(++i + " - " + actualTypeArgument.toString()); - } - buffer.append("Actual annotations: " + actualAnnotations.length + "\n"); - i = 0; - for (Annotation actualAnnotation : actualAnnotations) - { - buffer.append(++i + " - " + actualAnnotation.toString()); - } +// buffer.append("AnnotatedItemImpl:\n"); +// buffer.append(super.toString() + "\n"); +// buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); +// int i = 0; +// for (Type actualTypeArgument : actualTypeArguments) +// { +// buffer.append(++i + " - " + actualTypeArgument.toString()); +// } +// buffer.append("Actual annotations: " + actualAnnotations.length + "\n"); +// i = 0; +// for (Annotation actualAnnotation : actualAnnotations) +// { +// buffer.append(++i + " - " + actualAnnotation.toString()); +// } return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2008-11-28 08:20:56 UTC (rev 377) @@ -372,26 +372,26 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AnnotatedMethodImpl:\n"); - buffer.append(super.toString() + "\n"); - buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); - int i = 0; - for (Type actualTypeArgument : actualTypeArguments) - { - buffer.append(++i + " - " + actualTypeArgument.toString()); - } - buffer.append(annotatedParameters == null ? "" : (annotatedParameters.toString() + "\n")); - buffer.append("Declaring class:\n"); - buffer.append(declaringClass.toString()); - buffer.append("Method:\n"); - buffer.append(method.toString()); - buffer.append("Property name: " + propertyName + "\n"); - i = 0; - buffer.append("Parameters: " + getParameters().size() + "\n"); - for (AnnotatedParameter<?> parameter : parameters) - { - buffer.append(++i + " - " + parameter.toString() + "\n"); - } +// buffer.append("AnnotatedMethodImpl:\n"); +// buffer.append(super.toString() + "\n"); +// buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); +// int i = 0; +// for (Type actualTypeArgument : actualTypeArguments) +// { +// buffer.append(++i + " - " + actualTypeArgument.toString()); +// } +// buffer.append(annotatedParameters == null ? "" : (annotatedParameters.toString() + "\n")); +// buffer.append("Declaring class:\n"); +// buffer.append(declaringClass.toString()); +// buffer.append("Method:\n"); +// buffer.append(method.toString()); +// buffer.append("Property name: " + propertyName + "\n"); +// i = 0; +// buffer.append("Parameters: " + getParameters().size() + "\n"); +// for (AnnotatedParameter<?> parameter : parameters) +// { +// buffer.append(++i + " - " + parameter.toString() + "\n"); +// } return buffer.toString(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2008-11-28 08:11:35 UTC (rev 376) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2008-11-28 08:20:56 UTC (rev 377) @@ -148,18 +148,17 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("AnnotatedParameterImpl:\n"); - buffer.append(super.toString() + "\n"); - buffer.append("Type: " + type.toString() + "\n"); - buffer.append("Final: " + _final + "\n"); - buffer.append("Static: " + _static + "\n"); - buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); - int i = 0; - for (Type actualTypeArgument : actualTypeArguments) - { - buffer.append(++i + " - " + actualTypeArgument.toString() + "\n"); - } - +// buffer.append("AnnotatedParameterImpl:\n"); +// buffer.append(super.toString() + "\n"); +// buffer.append("Type: " + type.toString() + "\n"); +// buffer.append("Final: " + _final + "\n"); +// buffer.append("Static: " + _static + "\n"); +// buffer.append("Actual type arguments: " + actualTypeArguments.length + "\n"); +// int i = 0; +// for (Type actualTypeArgument : actualTypeArguments) +// { +// buffer.append(++i + " - " + actualTypeArgument.toString() + "\n"); +// } return buffer.toString(); }