1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Mon Mar 09 13:34:19 2009 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Mon Mar 09 23:53:41 2009 -0700 1.3 @@ -25,12 +25,12 @@ 1.4 1.5 package com.sun.tools.doclets.formats.html; 1.6 1.7 +import java.util.*; 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.util.*; 1.12 import com.sun.tools.doclets.internal.toolkit.builders.*; 1.13 -import com.sun.javadoc.*; 1.14 - 1.15 -import java.util.*; 1.16 import com.sun.tools.doclets.internal.toolkit.taglets.*; 1.17 1.18 /** 1.19 @@ -171,8 +171,6 @@ 1.20 */ 1.21 public void writeClassSignature(String modifiers) { 1.22 boolean isInterface = classDoc.isInterface(); 1.23 - dl(); 1.24 - dt(); 1.25 preNoNewLine(); 1.26 writeAnnotationInfo(classDoc); 1.27 print(modifiers); 1.28 @@ -191,7 +189,7 @@ 1.29 Type superclass = Util.getFirstVisibleSuperClass(classDoc, 1.30 configuration()); 1.31 if (superclass != null) { 1.32 - dt(); 1.33 + println(); 1.34 print("extends "); 1.35 printLink(new LinkInfoImpl( 1.36 LinkInfoImpl.CONTEXT_CLASS_SIGNATURE_PARENT_NAME, 1.37 @@ -208,7 +206,7 @@ 1.38 continue; 1.39 } 1.40 if (counter == 0) { 1.41 - dt(); 1.42 + println(); 1.43 print(isInterface? "extends " : "implements "); 1.44 } else { 1.45 print(", "); 1.46 @@ -219,7 +217,6 @@ 1.47 counter++; 1.48 } 1.49 } 1.50 - dlEnd(); 1.51 preEnd(); 1.52 p(); 1.53 } 1.54 @@ -342,6 +339,7 @@ 1.55 TagletOutput output = (new ParamTaglet()).getTagletOutput(classDoc, 1.56 getTagletWriterInstance(false)); 1.57 print(output.toString()); 1.58 + dtEnd(); 1.59 dlEnd(); 1.60 } 1.61 } 1.62 @@ -360,8 +358,10 @@ 1.63 dl(); 1.64 dt(); 1.65 strongText("doclet.Subclasses"); 1.66 + dtEnd(); 1.67 writeClassLinks(LinkInfoImpl.CONTEXT_SUBCLASSES, 1.68 subclasses); 1.69 + dlEnd(); 1.70 } 1.71 } 1.72 } 1.73 @@ -376,8 +376,10 @@ 1.74 dl(); 1.75 dt(); 1.76 strongText("doclet.Subinterfaces"); 1.77 + dtEnd(); 1.78 writeClassLinks(LinkInfoImpl.CONTEXT_SUBINTERFACES, 1.79 subInterfaces); 1.80 + dlEnd(); 1.81 } 1.82 } 1.83 } 1.84 @@ -398,8 +400,10 @@ 1.85 dl(); 1.86 dt(); 1.87 strongText("doclet.Implementing_Classes"); 1.88 + dtEnd(); 1.89 writeClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_CLASSES, 1.90 implcl); 1.91 + dlEnd(); 1.92 } 1.93 } 1.94 1.95 @@ -414,8 +418,10 @@ 1.96 dl(); 1.97 dt(); 1.98 strongText("doclet.All_Implemented_Interfaces"); 1.99 + dtEnd(); 1.100 writeClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_INTERFACES, 1.101 interfaceArray); 1.102 + dlEnd(); 1.103 } 1.104 } 1.105 1.106 @@ -430,8 +436,10 @@ 1.107 dl(); 1.108 dt(); 1.109 strongText("doclet.All_Superinterfaces"); 1.110 + dtEnd(); 1.111 writeClassLinks(LinkInfoImpl.CONTEXT_SUPER_INTERFACES, 1.112 interfaceArray); 1.113 + dlEnd(); 1.114 } 1.115 } 1.116 1.117 @@ -455,7 +463,6 @@ 1.118 } 1.119 } 1.120 ddEnd(); 1.121 - dlEnd(); 1.122 } 1.123 1.124 protected void navLinkTree() { 1.125 @@ -574,6 +581,7 @@ 1.126 } else { 1.127 strongText("doclet.Enclosing_Class"); 1.128 } 1.129 + dtEnd(); 1.130 dd(); 1.131 printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS, outerClass, 1.132 false));