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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java	Wed Nov 14 17:23:10 2012 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java	Thu Nov 15 09:18:36 2012 -0800
     1.3 @@ -102,11 +102,11 @@
     1.4          Content pre = new HtmlTree(HtmlTag.PRE);
     1.5          writer.addAnnotationInfo(field, pre);
     1.6          addModifiers(field, pre);
     1.7 -        Content fieldlink = new RawHtml(writer.getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_MEMBER,
     1.8 -                field.type())));
     1.9 +        Content fieldlink = new RawHtml(writer.getLink(new LinkInfoImpl(
    1.10 +                configuration, LinkInfoImpl.CONTEXT_MEMBER, field.type())));
    1.11          pre.addContent(fieldlink);
    1.12          pre.addContent(" ");
    1.13 -        if (configuration().linksource) {
    1.14 +        if (configuration.linksource) {
    1.15              Content fieldName = new StringContent(field.name());
    1.16              writer.addSrcLink(field, fieldName, pre);
    1.17          } else {
    1.18 @@ -129,7 +129,7 @@
    1.19          ClassDoc holder = field.containingClass();
    1.20          if (field.inlineTags().length > 0) {
    1.21              if (holder.equals(classdoc) ||
    1.22 -                    (! (holder.isPublic() || Util.isLinkable(holder, configuration())))) {
    1.23 +                    (! (holder.isPublic() || Util.isLinkable(holder, configuration)))) {
    1.24                  writer.addInlineComment(field, fieldDocTree);
    1.25              } else {
    1.26                  Content link = new RawHtml(
    1.27 @@ -195,16 +195,16 @@
    1.28       * {@inheritDoc}
    1.29       */
    1.30      public String getTableSummary() {
    1.31 -        return configuration().getText("doclet.Member_Table_Summary",
    1.32 -                configuration().getText("doclet.Field_Summary"),
    1.33 -                configuration().getText("doclet.fields"));
    1.34 +        return configuration.getText("doclet.Member_Table_Summary",
    1.35 +                configuration.getText("doclet.Field_Summary"),
    1.36 +                configuration.getText("doclet.fields"));
    1.37      }
    1.38  
    1.39      /**
    1.40       * {@inheritDoc}
    1.41       */
    1.42      public String getCaption() {
    1.43 -        return configuration().getText("doclet.Fields");
    1.44 +        return configuration.getText("doclet.Fields");
    1.45      }
    1.46  
    1.47      /**
    1.48 @@ -213,9 +213,9 @@
    1.49      public String[] getSummaryTableHeader(ProgramElementDoc member) {
    1.50          String[] header = new String[] {
    1.51              writer.getModifierTypeHeader(),
    1.52 -            configuration().getText("doclet.0_and_1",
    1.53 -                    configuration().getText("doclet.Field"),
    1.54 -                    configuration().getText("doclet.Description"))
    1.55 +            configuration.getText("doclet.0_and_1",
    1.56 +                    configuration.getText("doclet.Field"),
    1.57 +                    configuration.getText("doclet.Description"))
    1.58          };
    1.59          return header;
    1.60      }
    1.61 @@ -232,7 +232,7 @@
    1.62       */
    1.63      public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
    1.64          inheritedTree.addContent(writer.getMarkerAnchor(
    1.65 -                "fields_inherited_from_class_" + configuration().getClassName(cd)));
    1.66 +                "fields_inherited_from_class_" + configuration.getClassName(cd)));
    1.67      }
    1.68  
    1.69      /**
    1.70 @@ -242,8 +242,8 @@
    1.71          Content classLink = new RawHtml(writer.getPreQualifiedClassLink(
    1.72                  LinkInfoImpl.CONTEXT_MEMBER, cd, false));
    1.73          Content label = new StringContent(cd.isClass() ?
    1.74 -            configuration().getText("doclet.Fields_Inherited_From_Class") :
    1.75 -            configuration().getText("doclet.Fields_Inherited_From_Interface"));
    1.76 +            configuration.getText("doclet.Fields_Inherited_From_Class") :
    1.77 +            configuration.getText("doclet.Fields_Inherited_From_Interface"));
    1.78          Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
    1.79                  label);
    1.80          labelHeading.addContent(writer.getSpace());
    1.81 @@ -296,7 +296,7 @@
    1.82              return writer.getHyperLink((cd == null)?
    1.83                  "field_summary":
    1.84                  "fields_inherited_from_class_" +
    1.85 -                configuration().getClassName(cd),
    1.86 +                configuration.getClassName(cd),
    1.87                  writer.getResource("doclet.navField"));
    1.88          } else {
    1.89              return writer.getResource("doclet.navField");