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

-:bcbc86cc5b31
+:90af8d87741f
 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.tools.doclets.formats.html.markup.*;
 /**
 * Generate serialized form for serializable fields.
 * Documentation denoted by the tags <code>serial</code> and
 * <code>serialField</code> is processed.
 public class HtmlSerialFieldWriter extends FieldWriterImpl
 implements SerializedFormWriter.SerialFieldWriter {
 ProgramElementDoc[] members = null;
 private boolean printedOverallAnchor = false;
-private boolean printedFirstMember = false;
 public HtmlSerialFieldWriter(SubWriterHolderWriter writer,
 ClassDoc classdoc) {
 super(writer, classdoc);
 }
 writer.printLink(new LinkInfoImpl(
 LinkInfoImpl.CONTEXT_SERIAL_MEMBER, type));
 }
 }
-public void writeHeader(String heading) {
+/**
-if (! printedOverallAnchor) {
+* Return the header for serializable fields section.
-writer.anchor("serializedForm");
+*
-printedOverallAnchor = true;
+* @return a content tree for the header
-writer.printTableHeadingBackground(heading);
+*/
-writer.println();
+public Content getSerializableFieldsHeader() {
-if (heading.equals(
+HtmlTree ul = new HtmlTree(HtmlTag.UL);
-configuration().getText("doclet.Serialized_Form_class"))) {
+ul.addStyle(HtmlStyle.blockList);
-assert !writer.getMemberDetailsListPrinted();
+return ul;
+}
+/**
+* Return the header for serializable fields content section.
+*
+* @param isLastContent true if the cotent being documented is the last content.
+* @return a content tree for the header
+*/
+public Content getFieldsContentHeader(boolean isLastContent) {
+HtmlTree li = new HtmlTree(HtmlTag.LI);
+if (isLastContent)
+li.addStyle(HtmlStyle.blockListLast);
+else
+li.addStyle(HtmlStyle.blockList);
+return li;
+}
+/**
+* Add serializable fields.
+*
+* @param heading the heading for the section
+* @param serializableFieldsTree the tree to be added to the serializable fileds
+*        content tree
+* @return a content tree for the serializable fields content
+*/
+public Content getSerializableFields(String heading, Content serializableFieldsTree) {
+HtmlTree li = new HtmlTree(HtmlTag.LI);
+li.addStyle(HtmlStyle.blockList);
+if (serializableFieldsTree.isValid()) {
+if (!printedOverallAnchor) {
+li.addContent(writer.getMarkerAnchor("serializedForm"));
+printedOverallAnchor = true;
 }
+Content headingContent = new StringContent(heading);
+Content serialHeading = HtmlTree.HEADING(HtmlConstants.SERIALIZED_MEMBER_HEADING,
+headingContent);
+li.addContent(serialHeading);
+li.addContent(serializableFieldsTree);
+}
+return li;
+}
+/**
+* Add the member header.
+*
+* @param fieldsType the class document to be listed
+* @param fieldTypeStr the string for the filed type to be documented
+* @param fieldDimensions the dimensions of the field string to be added
+* @param firldName name of the field to be added
+* @param contentTree the content tree to which the member header will be added
+*/
+public void addMemberHeader(ClassDoc fieldType, String fieldTypeStr,
+String fieldDimensions, String fieldName, Content contentTree) {
+Content nameContent = new RawHtml(fieldName);
+Content heading = HtmlTree.HEADING(HtmlConstants.MEMBER_HEADING, nameContent);
+contentTree.addContent(heading);
+Content pre = new HtmlTree(HtmlTag.PRE);
+if (fieldType == null) {
+pre.addContent(fieldTypeStr);
 } else {
-writer.printTableHeadingBackground(heading);
+Content fieldContent = new RawHtml(writer.getLink(new LinkInfoImpl(
-writer.println();
+LinkInfoImpl.CONTEXT_SERIAL_MEMBER, fieldType)));
-}
+pre.addContent(fieldContent);
 }
+pre.addContent(fieldDimensions + " ");
-public void writeMemberHeader(ClassDoc fieldType, String fieldTypeStr,
+pre.addContent(fieldName);
-String fieldDimensions, String fieldName) {
+contentTree.addContent(pre);
-if (printedFirstMember) {
+}
-writer.printMemberHeader();
-}
+/**
-printedFirstMember = true;
+* Add the deprecated information for this member.
-writer.h3();
-writer.print(fieldName);
-writer.h3End();
-writer.pre();
-if (fieldType == null) {
-writer.print(fieldTypeStr);
-} else {
-writer.printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_SERIAL_MEMBER,
-fieldType));
-}
-print(fieldDimensions + ' ');
-strong(fieldName);
-writer.preEnd();
-assert !writer.getMemberDetailsListPrinted();
-}
-/**
-* Write the deprecated information for this member.
 *
 * @param field the field to document.
-*/
+* @param contentTree the tree to which the deprecated info will be added
-public void writeMemberDeprecatedInfo(FieldDoc field) {
+*/
-printDeprecated(field);
+public void addMemberDeprecatedInfo(FieldDoc field, Content contentTree) {
-}
+addDeprecatedInfo(field, contentTree);
+}
-/**
-* Write the description text for this member.
+/**
+* Add the description text for this member.
 *
 * @param field the field to document.
-*/
+* @param contentTree the tree to which the deprecated info will be added
-public void writeMemberDescription(FieldDoc field) {
+*/
+public void addMemberDescription(FieldDoc field, Content contentTree) {
 if (field.inlineTags().length > 0) {
-writer.printMemberDetailsListStartTag();
+writer.addInlineComment(field, contentTree);
-writer.dd();
-writer.printInlineComment(field);
-writer.ddEnd();
 }
 Tag[] tags = field.tags("serial");
 if (tags.length > 0) {
-writer.printMemberDetailsListStartTag();
+writer.addInlineComment(field, tags[0], contentTree);
-writer.dd();
+}
-writer.printInlineComment(field, tags[0]);
+}
-writer.ddEnd();
-}
+/**
-}
+* Add the description text for this member represented by the tag.
+*
-/**
+* @param serialFieldTag the field to document (represented by tag)
-* Write the description text for this member represented by the tag.
+* @param contentTree the tree to which the deprecated info will be added
-*
+*/
-* @param serialFieldTag the field to document (represented by tag).
+public void addMemberDescription(SerialFieldTag serialFieldTag, Content contentTree) {
-*/
-public void writeMemberDescription(SerialFieldTag serialFieldTag) {
 String serialFieldTagDesc = serialFieldTag.description().trim();
 if (!serialFieldTagDesc.isEmpty()) {
-writer.dl();
+Content serialFieldContent = new RawHtml(serialFieldTagDesc);
-writer.dd();
+Content div = HtmlTree.DIV(HtmlStyle.block, serialFieldContent);
-writer.print(serialFieldTagDesc);
+contentTree.addContent(div);
-writer.ddEnd();
+}
-writer.dlEnd();
+}
-}
-}
+/**
+* Add the tag information for this member.
-/**
-* Write the tag information for this member.
 *
 * @param field the field to document.
-*/
+* @param contentTree the tree to which the member tags info will be added
-public void writeMemberTags(FieldDoc field) {
+*/
+public void addMemberTags(FieldDoc field, Content contentTree) {
 TagletOutputImpl output = new TagletOutputImpl("");
 TagletWriter.genTagOuput(configuration().tagletManager, field,
 configuration().tagletManager.getCustomTags(field),
 writer.getTagletWriterInstance(false), output);
 String outputString = output.toString().trim();
+Content dlTags = new HtmlTree(HtmlTag.DL);
 if (!outputString.isEmpty()) {
-writer.printMemberDetailsListStartTag();
+Content tagContent = new RawHtml(outputString);
-writer.dd();
+dlTags.addContent(tagContent);
-writer.dl();
+}
-print(outputString);
+contentTree.addContent(dlTags);
-writer.dlEnd();
-writer.ddEnd();
-}
 }
 /**
 * Check to see if overview details should be printed. If
 * nocomment option set or if there is no text to be printed
 }
 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