jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java

-:2c0076945b1a
+:8c55d5b0ed71
 * have any questions.
 */
 package com.sun.tools.doclets.formats.html;
+import java.util.*;
+import com.sun.javadoc.*;
 import com.sun.tools.doclets.internal.toolkit.*;
 import com.sun.tools.doclets.internal.toolkit.taglets.*;
 import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
-import java.util.*;
 /**
 * Generate serialized form for serializable fields.
 * Documentation denoted by the tags <code>serial</code> and
 * <code>serialField</code> is processed.
 *
 * @author Joe Fialli
+* @author Bhavesh Patel (Modified)
 */
 public class HtmlSerialFieldWriter extends FieldWriterImpl
 implements SerializedFormWriter.SerialFieldWriter {
 ProgramElementDoc[] members = null;
 printedOverallAnchor = true;
 writer.printTableHeadingBackground(heading);
 writer.println();
 if (heading.equals(
 configuration().getText("doclet.Serialized_Form_class"))) {
-writer.dl();
+assert !writer.getMemberDetailsListPrinted();
 }
 } else {
 writer.printTableHeadingBackground(heading);
 writer.println();
 }
 fieldType));
 }
 print(fieldDimensions + ' ');
 strong(fieldName);
 writer.preEnd();
-writer.dl();
+assert !writer.getMemberDetailsListPrinted();
 }
 /**
 * Write the deprecated information for this member.
 *
 * @param field the field to document.
 */
 public void writeMemberDeprecatedInfo(FieldDoc field) {
-print(((TagletOutputImpl)
+printDeprecated(field);
-(new DeprecatedTaglet()).getTagletOutput(field,
-writer.getTagletWriterInstance(false))).toString());
 }
 /**
 * Write the description text for this member.
 *
 * @param field the field to document.
 */
 public void writeMemberDescription(FieldDoc field) {
 if (field.inlineTags().length > 0) {
+writer.printMemberDetailsListStartTag();
 writer.dd();
 writer.printInlineComment(field);
+writer.ddEnd();
 }
 Tag[] tags = field.tags("serial");
 if (tags.length > 0) {
-writer.dt();
+writer.printMemberDetailsListStartTag();
 writer.dd();
 writer.printInlineComment(field, tags[0]);
+writer.ddEnd();
 }
 }
 /**
 * Write the description text for this member represented by the tag.
 *
 * @param serialFieldTag the field to document (represented by tag).
 */
 public void writeMemberDescription(SerialFieldTag serialFieldTag) {
-writer.dd();
+String serialFieldTagDesc = serialFieldTag.description().trim();
-writer.print(serialFieldTag.description());
+if (!serialFieldTagDesc.isEmpty()) {
-writer.dlEnd();
+writer.dl();
+writer.dd();
+writer.print(serialFieldTagDesc);
+writer.ddEnd();
+writer.dlEnd();
+}
 }
 /**
 * Write the tag information for this member.
 *
 * @param field the field to document.
 */
 public void writeMemberTags(FieldDoc field) {
-writer.dl();
 TagletOutputImpl output = new TagletOutputImpl("");
 TagletWriter.genTagOuput(configuration().tagletManager, field,
 configuration().tagletManager.getCustomTags(field),
 writer.getTagletWriterInstance(false), output);
-if (output.toString().length() > 0) {
+String outputString = output.toString().trim();
-print(output.toString());
+if (!outputString.isEmpty()) {
-}
+writer.printMemberDetailsListStartTag();
-writer.dlEnd();
+writer.dd();
-}
+writer.dl();
-public void writeMemberFooter(FieldDoc member) {
+print(outputString);
 writer.dlEnd();
-}
+writer.ddEnd();
+}
-/**
+}
-* Check to see if member details should be printed. If
+/**
+* Check to see if overview details should be printed. If
 * nocomment option set or if there is no text to be printed
-* for deprecation info, inline comment, no serial tag or inline tags,
+* for deprecation info, comment or tags, do not print overview details.
-* do not print member details.
+*
-*/
+* @param field the field to check overview details for.
-public boolean shouldPrintMemberDetails(FieldDoc field) {
+* @return true if overview details need to be printed
-if (!configuration().nocomment)
+*/
-if((field.inlineTags().length > 0) ||
+public boolean shouldPrintOverview(FieldDoc field) {
-(field.tags("serial").length > 0) || (writer.hasTagsToPrint(field)))
+if (!configuration().nocomment) {
+if(!field.commentText().isEmpty() ||
+writer.hasSerializationOverviewTags(field))
 return true;
-if (!Util.isDeprecated(field))
+}
+if (field.tags("deprecated").length > 0)
 return true;
 return false;
 }
+public void writeMemberFooter() {
+printMemberFooter();
+}
+/**
+* Write the footer information. If the serilization overview section was
+* printed, check for definition list and close list tag.
+*
+* @param heading the heading that was written.
+*/
+public void writeFooter(String heading) {
+if (printedOverallAnchor) {
+if (heading.equals(
+configuration().getText("doclet.Serialized_Form_class"))) {
+writer.printMemberDetailsListEndTag();
+assert !writer.getMemberDetailsListPrinted();
+}
+}
+}
 }

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

comparison: src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java

src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java