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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Fri May 10 15:15:50 2013 +0200
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Tue May 14 10:14:51 2013 -0700
     1.3 @@ -62,7 +62,7 @@
     1.4       */
     1.5      protected int addTypeParameters(ExecutableMemberDoc member, Content htmltree) {
     1.6          LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
     1.7 -            LinkInfoImpl.CONTEXT_MEMBER_TYPE_PARAMS, member, false);
     1.8 +            LinkInfoImpl.Kind.MEMBER_TYPE_PARAMS, member, false);
     1.9          String typeParameters = writer.getTypeParameterLinks(linkInfo);
    1.10          if (linkInfo.displayLength > 0) {
    1.11              Content linkContent = new RawHtml(typeParameters);
    1.12 @@ -78,7 +78,7 @@
    1.13       */
    1.14      protected Content getDeprecatedLink(ProgramElementDoc member) {
    1.15          ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
    1.16 -        return writer.getDocLink(LinkInfoImpl.CONTEXT_MEMBER, (MemberDoc) emd,
    1.17 +        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, (MemberDoc) emd,
    1.18                  emd.qualifiedName() + emd.flatSignature());
    1.19      }
    1.20  
    1.21 @@ -90,7 +90,7 @@
    1.22       * @param member the member being linked to
    1.23       * @param tdSummary the content tree to which the link will be added
    1.24       */
    1.25 -    protected void addSummaryLink(int context, ClassDoc cd, ProgramElementDoc member,
    1.26 +    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
    1.27              Content tdSummary) {
    1.28          ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
    1.29          String name = emd.name();
    1.30 @@ -113,7 +113,7 @@
    1.31      protected void addInheritedSummaryLink(ClassDoc cd,
    1.32              ProgramElementDoc member, Content linksTree) {
    1.33          linksTree.addContent(new RawHtml(
    1.34 -                writer.getDocLink(LinkInfoImpl.CONTEXT_MEMBER, cd, (MemberDoc) member,
    1.35 +                writer.getDocLink(LinkInfoImpl.Kind.MEMBER, cd, (MemberDoc) member,
    1.36                  member.name(), false)));
    1.37      }
    1.38  
    1.39 @@ -129,7 +129,7 @@
    1.40          boolean isVarArg, Content tree) {
    1.41          if (param.type() != null) {
    1.42              Content link = new RawHtml(writer.getLink(new LinkInfoImpl(
    1.43 -                    configuration, LinkInfoImpl.CONTEXT_EXECUTABLE_MEMBER_PARAM,
    1.44 +                    configuration, LinkInfoImpl.Kind.EXECUTABLE_MEMBER_PARAM,
    1.45                      param.type(), isVarArg)));
    1.46              tree.addContent(link);
    1.47          }
    1.48 @@ -153,7 +153,7 @@
    1.49          tree.addContent(writer.getSpace());
    1.50          tree.addContent(rcvrType.typeName());
    1.51          LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
    1.52 -                LinkInfoImpl.CONTEXT_CLASS_SIGNATURE, rcvrType);
    1.53 +                LinkInfoImpl.Kind.CLASS_SIGNATURE, rcvrType);
    1.54          tree.addContent(new RawHtml(writer.getTypeParameterLinks(linkInfo)));
    1.55          tree.addContent(writer.getSpace());
    1.56          tree.addContent("this");
    1.57 @@ -244,7 +244,7 @@
    1.58          Type[] exceptions = member.thrownExceptionTypes();
    1.59          if(exceptions.length > 0) {
    1.60              LinkInfoImpl memberTypeParam = new LinkInfoImpl(configuration,
    1.61 -                    LinkInfoImpl.CONTEXT_MEMBER, member, false);
    1.62 +                    LinkInfoImpl.Kind.MEMBER, member, false);
    1.63              int retlen = getReturnTypeLength(member);
    1.64              writer.getTypeParameterLinks(memberTypeParam);
    1.65              retlen += memberTypeParam.displayLength == 0 ?
    1.66 @@ -256,14 +256,14 @@
    1.67              htmltree.addContent("throws ");
    1.68              indent += "       ";
    1.69              Content link = new RawHtml(writer.getLink(new LinkInfoImpl(configuration,
    1.70 -                    LinkInfoImpl.CONTEXT_MEMBER, exceptions[0])));
    1.71 +                    LinkInfoImpl.Kind.MEMBER, exceptions[0])));
    1.72              htmltree.addContent(link);
    1.73              for(int i = 1; i < exceptions.length; i++) {
    1.74                  htmltree.addContent(",");
    1.75                  htmltree.addContent(DocletConstants.NL);
    1.76                  htmltree.addContent(indent);
    1.77                  Content exceptionLink = new RawHtml(writer.getLink(new LinkInfoImpl(
    1.78 -                        configuration, LinkInfoImpl.CONTEXT_MEMBER, exceptions[i])));
    1.79 +                        configuration, LinkInfoImpl.Kind.MEMBER, exceptions[i])));
    1.80                  htmltree.addContent(exceptionLink);
    1.81              }
    1.82          }
    1.83 @@ -278,7 +278,7 @@
    1.84                         rettype.dimension().length();
    1.85              } else {
    1.86                  LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
    1.87 -                    LinkInfoImpl.CONTEXT_MEMBER, rettype);
    1.88 +                    LinkInfoImpl.Kind.MEMBER, rettype);
    1.89                  writer.getLink(linkInfo);
    1.90                  return linkInfo.displayLength;
    1.91              }