1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Wed Nov 14 17:23:10 2012 -0800
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Thu Nov 15 09:18:36 2012 -0800
1.3 @@ -49,15 +49,17 @@
1.4 */
1.5 public abstract class AbstractMemberWriter {
1.6
1.7 - protected boolean printedSummaryHeader = false;
1.8 + protected final ConfigurationImpl configuration;
1.9 protected final SubWriterHolderWriter writer;
1.10 protected final ClassDoc classdoc;
1.11 public final boolean nodepr;
1.12
1.13 - public AbstractMemberWriter(SubWriterHolderWriter writer,
1.14 - ClassDoc classdoc) {
1.15 + protected boolean printedSummaryHeader = false;
1.16 +
1.17 + public AbstractMemberWriter(SubWriterHolderWriter writer, ClassDoc classdoc) {
1.18 + this.configuration = writer.configuration;
1.19 this.writer = writer;
1.20 - this.nodepr = configuration().nodeprecated;
1.21 + this.nodepr = configuration.nodeprecated;
1.22 this.classdoc = classdoc;
1.23 }
1.24
1.25 @@ -281,11 +283,11 @@
1.26 code.addContent(new HtmlTree(HtmlTag.BR));
1.27 }
1.28 code.addContent(new RawHtml(
1.29 - writer.getLink(new LinkInfoImpl(
1.30 + writer.getLink(new LinkInfoImpl(configuration,
1.31 LinkInfoImpl.CONTEXT_SUMMARY_RETURN_TYPE, type))));
1.32 } else {
1.33 code.addContent(new RawHtml(
1.34 - writer.getLink(new LinkInfoImpl(
1.35 + writer.getLink(new LinkInfoImpl(configuration,
1.36 LinkInfoImpl.CONTEXT_SUMMARY_RETURN_TYPE, type))));
1.37 }
1.38
1.39 @@ -305,7 +307,7 @@
1.40 } else if (member.isPrivate()) {
1.41 code.addContent("private ");
1.42 } else if (!member.isPublic()) { // Package private
1.43 - code.addContent(configuration().getText("doclet.Package_private"));
1.44 + code.addContent(configuration.getText("doclet.Package_private"));
1.45 code.addContent(" ");
1.46 }
1.47 if (member.isMethod() && ((MethodDoc)member).isAbstract()) {
1.48 @@ -389,7 +391,7 @@
1.49 String tableSummary, String[] tableHeader, Content contentTree) {
1.50 if (deprmembers.size() > 0) {
1.51 Content table = HtmlTree.TABLE(0, 3, 0, tableSummary,
1.52 - writer.getTableCaption(configuration().getText(headingKey)));
1.53 + writer.getTableCaption(configuration.getText(headingKey)));
1.54 table.addContent(writer.getSummaryTableHeader(tableHeader, "col"));
1.55 Content tbody = new HtmlTree(HtmlTag.TBODY);
1.56 for (int i = 0; i < deprmembers.size(); i++) {
1.57 @@ -507,8 +509,8 @@
1.58 }
1.59
1.60 protected void serialWarning(SourcePosition pos, String key, String a1, String a2) {
1.61 - if (configuration().serialwarn) {
1.62 - ConfigurationImpl.getInstance().getDocletSpecificMsg().warning(pos, key, a1, a2);
1.63 + if (configuration.serialwarn) {
1.64 + configuration.getDocletSpecificMsg().warning(pos, key, a1, a2);
1.65 }
1.66 }
1.67
1.68 @@ -516,10 +518,6 @@
1.69 return nodepr? Util.excludeDeprecatedMembers(members): members;
1.70 }
1.71
1.72 - public ConfigurationImpl configuration() {
1.73 - return writer.configuration;
1.74 - }
1.75 -
1.76 /**
1.77 * Add the member summary for the given class.
1.78 *
