1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Tue May 14 10:14:53 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Tue May 14 10:14:53 2013 -0700 1.3 @@ -193,14 +193,13 @@ 1.4 protected abstract void addNavDetailLink(boolean link, Content liNav); 1.5 1.6 /** 1.7 - * Add the member name to the content tree and modifies the display length. 1.8 + * Add the member name to the content tree. 1.9 * 1.10 * @param name the member name to be added to the content tree. 1.11 * @param htmltree the content tree to which the name will be added. 1.12 */ 1.13 protected void addName(String name, Content htmltree) { 1.14 htmltree.addContent(name); 1.15 - writer.displayLength += name.length(); 1.16 } 1.17 1.18 /** 1.19 @@ -259,7 +258,7 @@ 1.20 return ""; 1.21 } 1.22 StringBuilder sb = new StringBuilder(len); 1.23 - for(int i = 0; i < len; i++) { 1.24 + for (int i = 0; i < len; i++) { 1.25 sb.append(' '); 1.26 } 1.27 return sb.toString(); 1.28 @@ -286,11 +285,14 @@ 1.29 } else { 1.30 if (member instanceof ExecutableMemberDoc && 1.31 ((ExecutableMemberDoc) member).typeParameters().length > 0) { 1.32 + Content typeParameters = ((AbstractExecutableMemberWriter) this).getTypeParameters( 1.33 + (ExecutableMemberDoc) member); 1.34 + code.addContent(typeParameters); 1.35 //Code to avoid ugly wrapping in member summary table. 1.36 - int displayLength = ((AbstractExecutableMemberWriter) this).addTypeParameters( 1.37 - (ExecutableMemberDoc) member, code); 1.38 - if (displayLength > 10) { 1.39 + if (typeParameters.charCount() > 10) { 1.40 code.addContent(new HtmlTree(HtmlTag.BR)); 1.41 + } else { 1.42 + code.addContent(writer.getSpace()); 1.43 } 1.44 code.addContent( 1.45 writer.getLink(new LinkInfoImpl(configuration,