src/share/classes/java/lang/reflect/Field.java

*** 293,304 ****
       * @jls 8.3.1 Field Modifiers
       */
      public String toString() {
          int mod = getModifiers();
          return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
!             + getTypeName(getType()) + " "
!             + getTypeName(getDeclaringClass()) + "."
              + getName());
      }
  
      /**
       * Returns a string describing this {@code Field}, including
--- 293,304 ----
       * @jls 8.3.1 Field Modifiers
       */
      public String toString() {
          int mod = getModifiers();
          return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
!             + getType().getTypeName() + " "
!             + getDeclaringClass().getTypeName() + "."
              + getName());
      }
  
      /**
       * Returns a string describing this {@code Field}, including
*** 322,334 ****
       */
      public String toGenericString() {
          int mod = getModifiers();
          Type fieldType = getGenericType();
          return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
!             +  ((fieldType instanceof Class) ?
!                 getTypeName((Class)fieldType): fieldType.toString())+ " "
!             + getTypeName(getDeclaringClass()) + "."
              + getName());
      }
  
      /**
       * Returns the value of the field represented by this {@code Field}, on
--- 322,333 ----
       */
      public String toGenericString() {
          int mod = getModifiers();
          Type fieldType = getGenericType();
          return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
!             + fieldType.getTypeName() + " "
!             + getDeclaringClass().getTypeName() + "."
              + getName());
      }
  
      /**
       * Returns the value of the field represented by this {@code Field}, on
*** 994,1026 ****
                  checkAccess(caller, clazz, obj, modifiers);
              }
          }
      }
  
-     /*
-      * Utility routine to paper over array type names
-      */
-     static String getTypeName(Class<?> type) {
-         if (type.isArray()) {
-             try {
-                 Class<?> cl = type;
-                 int dimensions = 0;
-                 while (cl.isArray()) {
-                     dimensions++;
-                     cl = cl.getComponentType();
-                 }
-                 StringBuffer sb = new StringBuffer();
-                 sb.append(cl.getName());
-                 for (int i = 0; i < dimensions; i++) {
-                     sb.append("[]");
-                 }
-                 return sb.toString();
-             } catch (Throwable e) { /*FALLTHRU*/ }
-         }
-         return type.getName();
-     }
- 
      /**
       * @throws NullPointerException {@inheritDoc}
       * @since 1.5
       */
      public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
--- 993,1002 ----