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

changeset 1735
8ea30d59ac41
parent 1686
eb134c8e931d
child 1736
74cd21f2c2fe
     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Fri May 10 15:15:50 2013 +0200
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Tue May 14 10:14:51 2013 -0700
     1.3 @@ -153,7 +153,7 @@
     1.4                  writer.addInlineComment(method, methodDocTree);
     1.5              } else {
     1.6                  Content link = new RawHtml(
     1.7 -                        writer.getDocLink(LinkInfoImpl.CONTEXT_METHOD_DOC_COPY,
     1.8 +                        writer.getDocLink(LinkInfoImpl.Kind.METHOD_DOC_COPY,
     1.9                          holder.asClassDoc(), method,
    1.10                          holder.asClassDoc().isIncluded() ?
    1.11                              holder.typeName() : holder.qualifiedTypeName(),
    1.12 @@ -261,7 +261,7 @@
    1.13       */
    1.14      public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
    1.15          Content classLink = new RawHtml(writer.getPreQualifiedClassLink(
    1.16 -                LinkInfoImpl.CONTEXT_MEMBER, cd, false));
    1.17 +                LinkInfoImpl.Kind.MEMBER, cd, false));
    1.18          Content label = new StringContent(cd.isClass() ?
    1.19              configuration.getText("doclet.Methods_Inherited_From_Class") :
    1.20              configuration.getText("doclet.Methods_Inherited_From_Interface"));
    1.21 @@ -300,14 +300,14 @@
    1.22              return;
    1.23          }
    1.24          Content label = writer.overridesLabel;
    1.25 -        int context = LinkInfoImpl.CONTEXT_METHOD_OVERRIDES;
    1.26 +        LinkInfoImpl.Kind context = LinkInfoImpl.Kind.METHOD_OVERRIDES;
    1.27  
    1.28          if (method != null) {
    1.29              if (overriddenType.asClassDoc().isAbstract() && method.isAbstract()){
    1.30                  //Abstract method is implemented from abstract class,
    1.31                  //not overridden
    1.32                  label = writer.specifiedByLabel;
    1.33 -                context = LinkInfoImpl.CONTEXT_METHOD_SPECIFIED_BY;
    1.34 +                context = LinkInfoImpl.Kind.METHOD_SPECIFIED_BY;
    1.35              }
    1.36              Content dt = HtmlTree.DT(HtmlTree.STRONG(label));
    1.37              dl.addContent(dt);
    1.38 @@ -316,7 +316,7 @@
    1.39              Content codeOverridenTypeLink = HtmlTree.CODE(overriddenTypeLink);
    1.40              String name = method.name();
    1.41              Content methlink = new RawHtml(writer.getLink(
    1.42 -                    new LinkInfoImpl(writer.configuration, LinkInfoImpl.CONTEXT_MEMBER,
    1.43 +                    new LinkInfoImpl(writer.configuration, LinkInfoImpl.Kind.MEMBER,
    1.44                      overriddenType.asClassDoc(),
    1.45                      writer.getAnchor(method), name, false)));
    1.46              Content codeMethLink = HtmlTree.CODE(methlink);
    1.47 @@ -362,12 +362,12 @@
    1.48              MethodDoc implementedMeth = implementedMethods[i];
    1.49              Type intfac = implementedMethodsFinder.getMethodHolder(implementedMeth);
    1.50              Content intfaclink = new RawHtml(writer.getLink(new LinkInfoImpl(
    1.51 -                    writer.configuration, LinkInfoImpl.CONTEXT_METHOD_SPECIFIED_BY, intfac)));
    1.52 +                    writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac)));
    1.53              Content codeIntfacLink = HtmlTree.CODE(intfaclink);
    1.54              Content dt = HtmlTree.DT(HtmlTree.STRONG(writer.specifiedByLabel));
    1.55              dl.addContent(dt);
    1.56              Content methlink = new RawHtml(writer.getDocLink(
    1.57 -                    LinkInfoImpl.CONTEXT_MEMBER, implementedMeth,
    1.58 +                    LinkInfoImpl.Kind.MEMBER, implementedMeth,
    1.59                      implementedMeth.name(), false));
    1.60              Content codeMethLink = HtmlTree.CODE(methlink);
    1.61              Content dd = HtmlTree.DD(codeMethLink);
    1.62 @@ -389,7 +389,7 @@
    1.63          Type type = method.returnType();
    1.64          if (type != null) {
    1.65              Content linkContent = new RawHtml(writer.getLink(
    1.66 -                    new LinkInfoImpl(configuration, LinkInfoImpl.CONTEXT_RETURN_TYPE, type)));
    1.67 +                    new LinkInfoImpl(configuration, LinkInfoImpl.Kind.RETURN_TYPE, type)));
    1.68              htmltree.addContent(linkContent);
    1.69              htmltree.addContent(writer.getSpace());
    1.70          }

mercurial