Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Fri Feb 13 11:57:33 2009 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Wed Feb 18 13:47:27 2009 -0800
     1.3 @@ -403,16 +403,17 @@
     1.4          if (classDoc.definesSerializableFields()) {
     1.5              FieldDoc serialPersistentField =
     1.6                  Util.asList(classDoc.serializableFields()).get(0);
     1.7 -            String comment = serialPersistentField.commentText();
     1.8 -            if (comment.length() > 0) {
     1.9 +            // Check to see if there are inline comments, tags or deprecation
    1.10 +            // information to be printed.
    1.11 +            if (fieldWriter.shouldPrintMemberDetails(serialPersistentField)) {
    1.12                  fieldWriter.writeHeader(
    1.13                      configuration.getText("doclet.Serialized_Form_class"));
    1.14 +                fieldWriter.writeMemberDeprecatedInfo(serialPersistentField);
    1.15                  if (!configuration.nocomment) {
    1.16 -                    fieldWriter.writeMemberDeprecatedInfo(serialPersistentField);
    1.17                      fieldWriter.writeMemberDescription(serialPersistentField);
    1.18                      fieldWriter.writeMemberTags(serialPersistentField);
    1.19 -                    fieldWriter.writeMemberFooter(serialPersistentField);
    1.20                  }
    1.21 +                fieldWriter.writeMemberFooter(serialPersistentField);
    1.22              }
    1.23          }
    1.24      }
    1.25 @@ -429,6 +430,16 @@
    1.26      }
    1.27  
    1.28      /**
    1.29 +     * Build the field deprecation information.
    1.30 +     */
    1.31 +    public void buildFieldDeprecationInfo() {
    1.32 +        if (!currentClass.definesSerializableFields()) {
    1.33 +            FieldDoc field = (FieldDoc)currentMember;
    1.34 +            fieldWriter.writeMemberDeprecatedInfo(field);
    1.35 +        }
    1.36 +    }
    1.37 +
    1.38 +    /**
    1.39       * Build the field information.
    1.40       */
    1.41      public void buildFieldInfo() {
    1.42 @@ -459,7 +470,6 @@
    1.43                          "doclet.MissingSerialTag", cd.qualifiedName(),
    1.44                          field.name());
    1.45              }
    1.46 -            fieldWriter.writeMemberDeprecatedInfo(field);
    1.47              fieldWriter.writeMemberDescription(field);
    1.48              fieldWriter.writeMemberTags(field);
    1.49          }