1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Wed Nov 14 17:23:10 2012 -0800
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Thu Nov 15 09:18:36 2012 -0800
1.3 @@ -123,7 +123,7 @@
1.4 addModifiers(method, pre);
1.5 addTypeParameters(method, pre);
1.6 addReturnType(method, pre);
1.7 - if (configuration().linksource) {
1.8 + if (configuration.linksource) {
1.9 Content methodName = new StringContent(method.name());
1.10 writer.addSrcLink(method, methodName, pre);
1.11 } else {
1.12 @@ -149,7 +149,7 @@
1.13 if (method.inlineTags().length > 0) {
1.14 if (holder.asClassDoc().equals(classdoc) ||
1.15 (! (holderClassDoc.isPublic() ||
1.16 - Util.isLinkable(holderClassDoc, configuration())))) {
1.17 + Util.isLinkable(holderClassDoc, configuration)))) {
1.18 writer.addInlineComment(method, methodDocTree);
1.19 } else {
1.20 Content link = new RawHtml(
1.21 @@ -215,16 +215,16 @@
1.22 * {@inheritDoc}
1.23 */
1.24 public String getTableSummary() {
1.25 - return configuration().getText("doclet.Member_Table_Summary",
1.26 - configuration().getText("doclet.Method_Summary"),
1.27 - configuration().getText("doclet.methods"));
1.28 + return configuration.getText("doclet.Member_Table_Summary",
1.29 + configuration.getText("doclet.Method_Summary"),
1.30 + configuration.getText("doclet.methods"));
1.31 }
1.32
1.33 /**
1.34 * {@inheritDoc}
1.35 */
1.36 public String getCaption() {
1.37 - return configuration().getText("doclet.Methods");
1.38 + return configuration.getText("doclet.Methods");
1.39 }
1.40
1.41 /**
1.42 @@ -233,9 +233,9 @@
1.43 public String[] getSummaryTableHeader(ProgramElementDoc member) {
1.44 String[] header = new String[] {
1.45 writer.getModifierTypeHeader(),
1.46 - configuration().getText("doclet.0_and_1",
1.47 - configuration().getText("doclet.Method"),
1.48 - configuration().getText("doclet.Description"))
1.49 + configuration.getText("doclet.0_and_1",
1.50 + configuration.getText("doclet.Method"),
1.51 + configuration.getText("doclet.Description"))
1.52 };
1.53 return header;
1.54 }
1.55 @@ -253,7 +253,7 @@
1.56 public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
1.57 inheritedTree.addContent(writer.getMarkerAnchor(
1.58 "methods_inherited_from_class_" +
1.59 - configuration().getClassName(cd)));
1.60 + configuration.getClassName(cd)));
1.61 }
1.62
1.63 /**
1.64 @@ -263,8 +263,8 @@
1.65 Content classLink = new RawHtml(writer.getPreQualifiedClassLink(
1.66 LinkInfoImpl.CONTEXT_MEMBER, cd, false));
1.67 Content label = new StringContent(cd.isClass() ?
1.68 - configuration().getText("doclet.Methods_Inherited_From_Class") :
1.69 - configuration().getText("doclet.Methods_Inherited_From_Interface"));
1.70 + configuration.getText("doclet.Methods_Inherited_From_Class") :
1.71 + configuration.getText("doclet.Methods_Inherited_From_Interface"));
1.72 Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
1.73 label);
1.74 labelHeading.addContent(writer.getSpace());
1.75 @@ -285,12 +285,12 @@
1.76 */
1.77 protected static void addOverridden(HtmlDocletWriter writer,
1.78 Type overriddenType, MethodDoc method, Content dl) {
1.79 - if(writer.configuration.nocomment){
1.80 + if (writer.configuration.nocomment) {
1.81 return;
1.82 }
1.83 ClassDoc holderClassDoc = overriddenType.asClassDoc();
1.84 if (! (holderClassDoc.isPublic() ||
1.85 - Util.isLinkable(holderClassDoc, writer.configuration()))) {
1.86 + Util.isLinkable(holderClassDoc, writer.configuration))) {
1.87 //This is an implementation detail that should not be documented.
1.88 return;
1.89 }
1.90 @@ -303,7 +303,7 @@
1.91 int context = LinkInfoImpl.CONTEXT_METHOD_OVERRIDES;
1.92
1.93 if (method != null) {
1.94 - if(overriddenType.asClassDoc().isAbstract() && method.isAbstract()){
1.95 + if (overriddenType.asClassDoc().isAbstract() && method.isAbstract()){
1.96 //Abstract method is implemented from abstract class,
1.97 //not overridden
1.98 label = writer.specifiedByLabel;
1.99 @@ -312,11 +312,11 @@
1.100 Content dt = HtmlTree.DT(HtmlTree.STRONG(label));
1.101 dl.addContent(dt);
1.102 Content overriddenTypeLink = new RawHtml(
1.103 - writer.getLink(new LinkInfoImpl(context, overriddenType)));
1.104 + writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType)));
1.105 Content codeOverridenTypeLink = HtmlTree.CODE(overriddenTypeLink);
1.106 String name = method.name();
1.107 Content methlink = new RawHtml(writer.getLink(
1.108 - new LinkInfoImpl(LinkInfoImpl.CONTEXT_MEMBER,
1.109 + new LinkInfoImpl(writer.configuration, LinkInfoImpl.CONTEXT_MEMBER,
1.110 overriddenType.asClassDoc(),
1.111 writer.getAnchor(method), name, false)));
1.112 Content codeMethLink = HtmlTree.CODE(methlink);
1.113 @@ -362,7 +362,7 @@
1.114 MethodDoc implementedMeth = implementedMethods[i];
1.115 Type intfac = implementedMethodsFinder.getMethodHolder(implementedMeth);
1.116 Content intfaclink = new RawHtml(writer.getLink(new LinkInfoImpl(
1.117 - LinkInfoImpl.CONTEXT_METHOD_SPECIFIED_BY, intfac)));
1.118 + writer.configuration, LinkInfoImpl.CONTEXT_METHOD_SPECIFIED_BY, intfac)));
1.119 Content codeIntfacLink = HtmlTree.CODE(intfaclink);
1.120 Content dt = HtmlTree.DT(HtmlTree.STRONG(writer.specifiedByLabel));
1.121 dl.addContent(dt);
1.122 @@ -389,7 +389,7 @@
1.123 Type type = method.returnType();
1.124 if (type != null) {
1.125 Content linkContent = new RawHtml(writer.getLink(
1.126 - new LinkInfoImpl(LinkInfoImpl.CONTEXT_RETURN_TYPE, type)));
1.127 + new LinkInfoImpl(configuration, LinkInfoImpl.CONTEXT_RETURN_TYPE, type)));
1.128 htmltree.addContent(linkContent);
1.129 htmltree.addContent(writer.getSpace());
1.130 }
1.131 @@ -403,7 +403,7 @@
1.132 return writer.getHyperLink((cd == null)?
1.133 "method_summary":
1.134 "methods_inherited_from_class_" +
1.135 - configuration().getClassName(cd),
1.136 + configuration.getClassName(cd),
1.137 writer.getResource("doclet.navMethod"));
1.138 } else {
1.139 return writer.getResource("doclet.navMethod");
