1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Mon Mar 09 13:34:19 2009 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Mon Mar 09 23:53:41 2009 -0700 1.3 @@ -25,11 +25,10 @@ 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.javadoc.*; 1.13 - 1.14 -import java.io.*; 1.15 1.16 /** 1.17 * Writes annotation type required member documentation in HTML format. 1.18 @@ -134,17 +133,14 @@ 1.19 strong(member.name()); 1.20 } 1.21 writer.preEnd(); 1.22 - writer.dl(); 1.23 + assert !writer.getMemberDetailsListPrinted(); 1.24 } 1.25 1.26 /** 1.27 * {@inheritDoc} 1.28 */ 1.29 public void writeComments(MemberDoc member) { 1.30 - if (member.inlineTags().length > 0) { 1.31 - writer.dd(); 1.32 - writer.printInlineComment(member); 1.33 - } 1.34 + printComment(member); 1.35 } 1.36 1.37 /** 1.38 @@ -160,7 +156,7 @@ 1.39 * Write the annotation type member footer. 1.40 */ 1.41 public void writeMemberFooter() { 1.42 - writer.dlEnd(); 1.43 + printMemberFooter(); 1.44 } 1.45 1.46 /** 1.47 @@ -267,9 +263,7 @@ 1.48 * {@inheritDoc} 1.49 */ 1.50 public void writeDeprecated(MemberDoc member) { 1.51 - print(((TagletOutputImpl) 1.52 - (new DeprecatedTaglet()).getTagletOutput(member, 1.53 - writer.getTagletWriterInstance(false))).toString()); 1.54 + printDeprecated(member); 1.55 } 1.56 1.57 private Type getType(MemberDoc member) {