1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Mon Mar 09 13:34:19 2009 -0700
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Mon Mar 09 23:53:41 2009 -0700
1.3 @@ -25,12 +25,11 @@
1.4
1.5 package com.sun.tools.doclets.formats.html;
1.6
1.7 +import java.io.*;
1.8 +
1.9 +import com.sun.javadoc.*;
1.10 import com.sun.tools.doclets.internal.toolkit.*;
1.11 -import com.sun.tools.doclets.internal.toolkit.taglets.*;
1.12 import com.sun.tools.doclets.internal.toolkit.util.*;
1.13 -import com.sun.javadoc.*;
1.14 -
1.15 -import java.io.*;
1.16
1.17 /**
1.18 * Writes field documentation in HTML format.
1.19 @@ -156,7 +155,7 @@
1.20 strong(field.name());
1.21 }
1.22 writer.preEnd();
1.23 - writer.dl();
1.24 + assert !writer.getMemberDetailsListPrinted();
1.25 }
1.26
1.27 /**
1.28 @@ -165,9 +164,7 @@
1.29 * @param field the field being documented.
1.30 */
1.31 public void writeDeprecated(FieldDoc field) {
1.32 - print(((TagletOutputImpl)
1.33 - (new DeprecatedTaglet()).getTagletOutput(field,
1.34 - writer.getTagletWriterInstance(false))).toString());
1.35 + printDeprecated(field);
1.36 }
1.37
1.38 /**
1.39 @@ -178,10 +175,12 @@
1.40 public void writeComments(FieldDoc field) {
1.41 ClassDoc holder = field.containingClass();
1.42 if (field.inlineTags().length > 0) {
1.43 + writer.printMemberDetailsListStartTag();
1.44 if (holder.equals(classdoc) ||
1.45 (! (holder.isPublic() || Util.isLinkable(holder, configuration())))) {
1.46 writer.dd();
1.47 writer.printInlineComment(field);
1.48 + writer.ddEnd();
1.49 } else {
1.50 String classlink = writer.codeText(
1.51 writer.getDocLink(LinkInfoImpl.CONTEXT_FIELD_DOC_COPY,
1.52 @@ -196,6 +195,7 @@
1.53 writer.ddEnd();
1.54 writer.dd();
1.55 writer.printInlineComment(field);
1.56 + writer.ddEnd();
1.57 }
1.58 }
1.59 }
1.60 @@ -213,7 +213,7 @@
1.61 * Write the field footer.
1.62 */
1.63 public void writeFieldFooter() {
1.64 - writer.dlEnd();
1.65 + printMemberFooter();
1.66 }
1.67
1.68 /**
