[weld-commits] Weld SVN: r4771 - api/trunk/cdi/src/main/java/javax/enterprise/util.

[weld-commits at lists.jboss.org]

Author: gavin.king at jboss.com
Date: 2009-11-08 04:28:22 -0500 (Sun, 08 Nov 2009)
New Revision: 4771

Modified:
   api/trunk/cdi/src/main/java/javax/enterprise/util/AnnotationLiteral.java
Log:
mprove the tostring

Modified: api/trunk/cdi/src/main/java/javax/enterprise/util/AnnotationLiteral.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/util/AnnotationLiteral.java	2009-11-08 09:10:10 UTC (rev 4770)
+++ api/trunk/cdi/src/main/java/javax/enterprise/util/AnnotationLiteral.java	2009-11-08 09:28:22 UTC (rev 4771)
@@ -160,21 +160,45 @@
          {
             appendInBraces(string, Arrays.toString((char[])value));
          }
+         else if (value instanceof String[]) 
+         {
+            String[] strings = (String[]) value;
+            String[] quoted = new String[strings.length];
+            for(int j=0; j<strings.length; j++) 
+            {
+               quoted[j] = "\"" + strings[j] + "\"";
+            }
+            appendInBraces(string, Arrays.toString(quoted));
+         }
+         else if (value instanceof Class[]) 
+         {
+            Class[] classes = (Class[]) value;
+            String[] names = new String[classes.length];
+            for(int j=0; j<classes.length; j++) 
+            {
+               names[j] = classes[j].getName() + ".class";
+            }
+            appendInBraces(string, Arrays.toString(names));
+         }
          else if (value instanceof Object[]) 
          {
             appendInBraces(string, Arrays.toString((Object[])value));
          }
-         /*else if (value instanceof Class<?>) 
+         else if (value instanceof String) 
          {
-            string.append(((Class<?>)value).getName()).append(".class");
-         }*/
+            string.append('"').append(value).append('"');
+         }
+         else if (value instanceof Class) 
+         {
+            string.append(((Class)value).getName()).append(".class");
+         }
          else 
          {
             string.append(value);
          }
          if (i < getMembers().length - 1)
          {
-            string.append(',');
+            string.append(", ");
          }
       }
       return string.append(')').toString();