1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Mon Mar 09 13:34:19 2009 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Mon Mar 09 23:53:41 2009 -0700 1.3 @@ -25,11 +25,11 @@ 1.4 1.5 package com.sun.tools.doclets.formats.html; 1.6 1.7 -import com.sun.tools.doclets.internal.toolkit.util.*; 1.8 +import java.io.*; 1.9 +import java.util.*; 1.10 1.11 import com.sun.javadoc.*; 1.12 -import java.io.*; 1.13 -import java.util.*; 1.14 +import com.sun.tools.doclets.internal.toolkit.util.*; 1.15 1.16 /** 1.17 * Generate Index for all the Member Names with Indexing in 1.18 @@ -100,18 +100,22 @@ 1.19 h2(); 1.20 strong(unicode.toString()); 1.21 h2End(); 1.22 - dl(); 1.23 - for (int i = 0; i < memberlist.size(); i++) { 1.24 - Doc element = memberlist.get(i); 1.25 - if (element instanceof MemberDoc) { 1.26 - printDescription((MemberDoc)element); 1.27 - } else if (element instanceof ClassDoc) { 1.28 - printDescription((ClassDoc)element); 1.29 - } else if (element instanceof PackageDoc) { 1.30 - printDescription((PackageDoc)element); 1.31 + int memberListSize = memberlist.size(); 1.32 + // Display the list only if there are elements to be displayed. 1.33 + if (memberListSize > 0) { 1.34 + dl(); 1.35 + for (int i = 0; i < memberListSize; i++) { 1.36 + Doc element = memberlist.get(i); 1.37 + if (element instanceof MemberDoc) { 1.38 + printDescription((MemberDoc)element); 1.39 + } else if (element instanceof ClassDoc) { 1.40 + printDescription((ClassDoc)element); 1.41 + } else if (element instanceof PackageDoc) { 1.42 + printDescription((PackageDoc)element); 1.43 + } 1.44 } 1.45 + dlEnd(); 1.46 } 1.47 - dlEnd(); 1.48 hr(); 1.49 } 1.50 1.51 @@ -126,8 +130,10 @@ 1.52 printPackageLink(pkg, Util.getPackageName(pkg), true); 1.53 print(" - "); 1.54 print(configuration.getText("doclet.package") + " " + pkg.name()); 1.55 + dtEnd(); 1.56 dd(); 1.57 printSummaryComment(pkg); 1.58 + ddEnd(); 1.59 } 1.60 1.61 /** 1.62 @@ -140,8 +146,10 @@ 1.63 printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_INDEX, cd, true)); 1.64 print(" - "); 1.65 printClassInfo(cd); 1.66 + dtEnd(); 1.67 dd(); 1.68 printComment(cd); 1.69 + ddEnd(); 1.70 } 1.71 1.72 /** 1.73 @@ -178,8 +186,10 @@ 1.74 println(" - "); 1.75 printMemberDesc(member); 1.76 println(); 1.77 + dtEnd(); 1.78 dd(); 1.79 printComment(member); 1.80 + ddEnd(); 1.81 println(); 1.82 } 1.83