jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java

-:33abf479f202
+:bfec2a1cc869
 public int displayLength = 0;
 /**
 * The global configuration information for this run.
 */
-public ConfigurationImpl configuration;
+public final ConfigurationImpl configuration;
 /**
 * To check whether annotation heading is printed or not.
 */
 protected boolean printedAnnotationHeading = false;
 *                      false for files that appear in the left-hand frames
 * @param body the body htmltree to be included in the document
 */
 public void printHtmlDocument(String[] metakeywords, boolean includeScript,
 Content body) throws IOException {
-Content htmlDocType = DocType.Transitional();
+Content htmlDocType = DocType.TRANSITIONAL;
 Content htmlComment = new Comment(configuration.getText("doclet.New_Page"));
 Content head = new HtmlTree(HtmlTag.HEAD);
 if (!configuration.notimestamp) {
 Content headComment = new Comment(getGeneratedByString());
 head.addContent(headComment);
 */
 protected void addPackageDeprecatedAPI(List<Doc> deprPkgs, String headingKey,
 String tableSummary, String[] tableHeader, Content contentTree) {
 if (deprPkgs.size() > 0) {
 Content table = HtmlTree.TABLE(0, 3, 0, tableSummary,
-getTableCaption(configuration().getText(headingKey)));
+getTableCaption(configuration.getText(headingKey)));
 table.addContent(getSummaryTableHeader(tableHeader, "col"));
 Content tbody = new HtmlTree(HtmlTag.TBODY);
 for (int i = 0; i < deprPkgs.size(); i++) {
 PackageDoc pkg = (PackageDoc) deprPkgs.get(i);
 HtmlTree td = HtmlTree.TD(HtmlStyle.colOne,
 * @param context the id of the context where the link will be added
 * @param cd the class doc to link to
 * @return a content tree for the link
 */
 public Content getQualifiedClassLink(int context, ClassDoc cd) {
-return new RawHtml(getLink(new LinkInfoImpl(context, cd,
+return new RawHtml(getLink(new LinkInfoImpl(configuration, context, cd,
 configuration.getClassName(cd), "")));
 }
 /**
 * Add the class link.
 String classlink = "";
 PackageDoc pd = cd.containingPackage();
 if(pd != null && ! configuration.shouldExcludeQualifier(pd.name())) {
 classlink = getPkgName(cd);
 }
-classlink += getLink(new LinkInfoImpl(context, cd, cd.name(), isStrong));
+classlink += getLink(new LinkInfoImpl(configuration,
+context, cd, cd.name(), isStrong));
 return classlink;
 }
 /**
 * Add the class link with the package portion of the label in
 ClassDoc cd, boolean isStrong, Content contentTree) {
 PackageDoc pd = cd.containingPackage();
 if(pd != null && ! configuration.shouldExcludeQualifier(pd.name())) {
 contentTree.addContent(getPkgName(cd));
 }
-contentTree.addContent(new RawHtml(getLink(new LinkInfoImpl(
+contentTree.addContent(new RawHtml(getLink(new LinkInfoImpl(configuration,
 context, cd, cd.name(), isStrong))));
 }
 /**
 * Add the class link, with only class name as the strong link and prefixing
 * @return the link for the given member.
 */
 public String getDocLink(int context, ClassDoc classDoc, MemberDoc doc,
 String label, boolean strong) {
 if (! (doc.isIncluded() ||
-Util.isLinkable(classDoc, configuration()))) {
+Util.isLinkable(classDoc, configuration))) {
 return label;
 } else if (doc instanceof ExecutableMemberDoc) {
 ExecutableMemberDoc emd = (ExecutableMemberDoc)doc;
-return getLink(new LinkInfoImpl(context, classDoc,
+return getLink(new LinkInfoImpl(configuration, context, classDoc,
 getAnchor(emd), label, strong));
 } else if (doc instanceof MemberDoc) {
-return getLink(new LinkInfoImpl(context, classDoc,
+return getLink(new LinkInfoImpl(configuration, context, classDoc,
 doc.name(), label, strong));
 } else {
 return label;
 }
 }
 * @return the link for the given member
 */
 public Content getDocLink(int context, ClassDoc classDoc, MemberDoc doc,
 String label) {
 if (! (doc.isIncluded() ||
-Util.isLinkable(classDoc, configuration()))) {
+Util.isLinkable(classDoc, configuration))) {
 return new StringContent(label);
 } else if (doc instanceof ExecutableMemberDoc) {
 ExecutableMemberDoc emd = (ExecutableMemberDoc)doc;
-return new RawHtml(getLink(new LinkInfoImpl(context, classDoc,
+return new RawHtml(getLink(new LinkInfoImpl(configuration, context, classDoc,
 getAnchor(emd), label, false)));
 } else if (doc instanceof MemberDoc) {
-return new RawHtml(getLink(new LinkInfoImpl(context, classDoc,
+return new RawHtml(getLink(new LinkInfoImpl(configuration, context, classDoc,
 doc.name(), label, false)));
 } else {
 return new StringContent(label);
 }
 }
 } else if (refMemName == null) {
 // Must be a class reference since refClass is not null and refMemName is null.
 if (label.isEmpty()) {
 label = plainOrCodeText(plain, refClass.name());
 }
-return getLink(new LinkInfoImpl(refClass, label));
+return getLink(new LinkInfoImpl(configuration, refClass, label));
 } else if (refMem == null) {
 // Must be a member reference since refClass is not null and refMemName is not null.
 // However, refMem is null, so this referenced member does not exist.
 return (label.isEmpty() ? text: label);
 } else {
 // Must be a member reference since refClass is not null and refMemName is not null.
 // refMem is not null, so this @see tag must be referencing a valid member.
 ClassDoc containing = refMem.containingClass();
 if (see.text().trim().startsWith("#") &&
 ! (containing.isPublic() ||
-Util.isLinkable(containing, configuration()))) {
+Util.isLinkable(containing, configuration))) {
 // Since the link is relative and the holder is not even being
 // documented, this must be an inherited link.  Redirect it.
 // The current class either overrides the referenced member or
 // inherits it automatically.
 if (this instanceof ClassWriterImpl) {
 }
 StringTokenizer lines = new StringTokenizer(text, "\r\n", true);
 StringBuilder textBuff = new StringBuilder();
 while (lines.hasMoreTokens()) {
 StringBuilder line = new StringBuilder(lines.nextToken());
-Util.replaceTabs(configuration.sourcetab, line);
+Util.replaceTabs(configuration, line);
 textBuff.append(line.toString());
 }
 result.append(textBuff);
 }
 }
 AnnotationTypeDoc annotationDoc = descList[i].annotationType();
 if (! Util.isDocumentedAnnotation(annotationDoc)){
 continue;
 }
 annotation = new StringBuilder();
-LinkInfoImpl linkInfo = new LinkInfoImpl(
+LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
 LinkInfoImpl.CONTEXT_ANNOTATION, annotationDoc);
 linkInfo.label = "@" + annotationDoc.name();
 annotation.append(getLink(linkInfo));
 AnnotationDesc.ElementValuePair[] pairs = descList[i].elementValues();
 if (pairs.length > 0) {
 private String annotationValueToString(AnnotationValue annotationValue) {
 if (annotationValue.value() instanceof Type) {
 Type type = (Type) annotationValue.value();
 if (type.asClassDoc() != null) {
-LinkInfoImpl linkInfo = new LinkInfoImpl(
+LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
 LinkInfoImpl.CONTEXT_ANNOTATION, type);
 linkInfo.label = (type.asClassDoc().isIncluded() ?
 type.typeName() :
 type.qualifiedTypeName()) + type.dimension() + ".class";
 return getLink(linkInfo);

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java

src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java