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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java	Wed Oct 17 16:43:26 2012 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java	Tue Oct 23 13:20:37 2012 -0700
     1.3 @@ -66,8 +66,10 @@
     1.4      public TagletOutput getDocRootOutput() {
     1.5          if (htmlWriter.configuration.docrootparent.length() > 0)
     1.6              return new TagletOutputImpl(htmlWriter.configuration.docrootparent);
     1.7 +        else if (htmlWriter.pathToRoot.isEmpty())
     1.8 +            return new TagletOutputImpl(".");
     1.9          else
    1.10 -            return new TagletOutputImpl(htmlWriter.relativepathNoSlash);
    1.11 +            return new TagletOutputImpl(htmlWriter.pathToRoot.getPath());
    1.12      }
    1.13  
    1.14      /**
    1.15 @@ -170,18 +172,18 @@
    1.16                  htmlWriter instanceof ClassWriterImpl) {
    1.17              //Automatically add link to constant values page for constant fields.
    1.18              result = addSeeHeader(result);
    1.19 -            result += htmlWriter.getHyperLinkString(htmlWriter.relativePath +
    1.20 -                ConfigurationImpl.CONSTANTS_FILE_NAME
    1.21 -                + "#" + ((ClassWriterImpl) htmlWriter).getClassDoc().qualifiedName()
    1.22 +            result += htmlWriter.getHyperLinkString(htmlWriter.pathToRoot.resolve(
    1.23 +                DocPaths.CONSTANT_VALUES),
    1.24 +                ((ClassWriterImpl) htmlWriter).getClassDoc().qualifiedName()
    1.25                  + "." + ((FieldDoc) holder).name(),
    1.26 -                htmlWriter.configuration.getText("doclet.Constants_Summary"));
    1.27 +                htmlWriter.configuration.getText("doclet.Constants_Summary"), false);
    1.28          }
    1.29          if (holder.isClass() && ((ClassDoc)holder).isSerializable()) {
    1.30              //Automatically add link to serialized form page for serializable classes.
    1.31              if ((SerializedFormBuilder.serialInclude(holder) &&
    1.32                        SerializedFormBuilder.serialInclude(((ClassDoc)holder).containingPackage()))) {
    1.33                  result = addSeeHeader(result);
    1.34 -                result += htmlWriter.getHyperLinkString(htmlWriter.relativePath + "serialized-form.html",
    1.35 +                result += htmlWriter.getHyperLinkString(htmlWriter.pathToRoot.resolve(DocPaths.SERIALIZED_FORM),
    1.36                          ((ClassDoc)holder).qualifiedName(), htmlWriter.configuration.getText("doclet.Serialized_Form"), false);
    1.37              }
    1.38          }