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

changeset 1736
74cd21f2c2fe
parent 1735
8ea30d59ac41
child 1737
7a9ef837e57f
     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Tue May 14 10:14:51 2013 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Tue May 14 10:14:52 2013 -0700
     1.3 @@ -152,12 +152,12 @@
     1.4                      Util.isLinkable(holderClassDoc, configuration)))) {
     1.5                  writer.addInlineComment(method, methodDocTree);
     1.6              } else {
     1.7 -                Content link = new RawHtml(
     1.8 +                Content link =
     1.9                          writer.getDocLink(LinkInfoImpl.Kind.METHOD_DOC_COPY,
    1.10                          holder.asClassDoc(), method,
    1.11                          holder.asClassDoc().isIncluded() ?
    1.12                              holder.typeName() : holder.qualifiedTypeName(),
    1.13 -                            false));
    1.14 +                            false);
    1.15                  Content codelLink = HtmlTree.CODE(link);
    1.16                  Content strong = HtmlTree.STRONG(holder.asClassDoc().isClass()?
    1.17                      writer.descfrmClassLabel : writer.descfrmInterfaceLabel);
    1.18 @@ -311,14 +311,14 @@
    1.19              }
    1.20              Content dt = HtmlTree.DT(HtmlTree.STRONG(label));
    1.21              dl.addContent(dt);
    1.22 -            Content overriddenTypeLink = new RawHtml(
    1.23 -                    writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType)));
    1.24 +            Content overriddenTypeLink =
    1.25 +                    writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType));
    1.26              Content codeOverridenTypeLink = HtmlTree.CODE(overriddenTypeLink);
    1.27              String name = method.name();
    1.28 -            Content methlink = new RawHtml(writer.getLink(
    1.29 +            Content methlink = writer.getLink(
    1.30                      new LinkInfoImpl(writer.configuration, LinkInfoImpl.Kind.MEMBER,
    1.31                      overriddenType.asClassDoc(),
    1.32 -                    writer.getAnchor(method), name, false)));
    1.33 +                    writer.getAnchor(method), name, false));
    1.34              Content codeMethLink = HtmlTree.CODE(methlink);
    1.35              Content dd = HtmlTree.DD(codeMethLink);
    1.36              dd.addContent(writer.getSpace());
    1.37 @@ -361,14 +361,14 @@
    1.38          for (int i = 0; i < implementedMethods.length; i++) {
    1.39              MethodDoc implementedMeth = implementedMethods[i];
    1.40              Type intfac = implementedMethodsFinder.getMethodHolder(implementedMeth);
    1.41 -            Content intfaclink = new RawHtml(writer.getLink(new LinkInfoImpl(
    1.42 -                    writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac)));
    1.43 +            Content intfaclink = writer.getLink(new LinkInfoImpl(
    1.44 +                    writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac));
    1.45              Content codeIntfacLink = HtmlTree.CODE(intfaclink);
    1.46              Content dt = HtmlTree.DT(HtmlTree.STRONG(writer.specifiedByLabel));
    1.47              dl.addContent(dt);
    1.48 -            Content methlink = new RawHtml(writer.getDocLink(
    1.49 +            Content methlink = writer.getDocLink(
    1.50                      LinkInfoImpl.Kind.MEMBER, implementedMeth,
    1.51 -                    implementedMeth.name(), false));
    1.52 +                    implementedMeth.name(), false);
    1.53              Content codeMethLink = HtmlTree.CODE(methlink);
    1.54              Content dd = HtmlTree.DD(codeMethLink);
    1.55              dd.addContent(writer.getSpace());
    1.56 @@ -388,8 +388,8 @@
    1.57      protected void addReturnType(MethodDoc method, Content htmltree) {
    1.58          Type type = method.returnType();
    1.59          if (type != null) {
    1.60 -            Content linkContent = new RawHtml(writer.getLink(
    1.61 -                    new LinkInfoImpl(configuration, LinkInfoImpl.Kind.RETURN_TYPE, type)));
    1.62 +            Content linkContent = writer.getLink(
    1.63 +                    new LinkInfoImpl(configuration, LinkInfoImpl.Kind.RETURN_TYPE, type));
    1.64              htmltree.addContent(linkContent);
    1.65              htmltree.addContent(writer.getSpace());
    1.66          }

mercurial