Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Wed Aug 07 11:04:07 2013 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Wed Aug 07 15:00:24 2013 -0700
     1.3 @@ -101,7 +101,7 @@
     1.4              Content tdSummary) {
     1.5          ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
     1.6          String name = emd.name();
     1.7 -        Content strong = HtmlTree.STRONG(
     1.8 +        Content strong = HtmlTree.SPAN(HtmlStyle.strong,
     1.9                  writer.getDocLink(context, cd, (MemberDoc) emd,
    1.10                  name, false));
    1.11          Content code = HtmlTree.CODE(strong);

     2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java	Wed Aug 07 11:04:07 2013 +0100
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java	Wed Aug 07 15:00:24 2013 -0700
     2.3 @@ -225,7 +225,7 @@
     2.4       */
     2.5      protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
     2.6              Content tdSummary) {
     2.7 -        Content strong = HtmlTree.STRONG(
     2.8 +        Content strong = HtmlTree.SPAN(HtmlStyle.strong,
     2.9                  writer.getDocLink(context, (MemberDoc) member, member.name(), false));
    2.10          Content code = HtmlTree.CODE(strong);
    2.11          tdSummary.addContent(code);

     3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Wed Aug 07 11:04:07 2013 +0100
     3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Wed Aug 07 15:00:24 2013 -0700
     3.3 @@ -262,7 +262,7 @@
     3.4          annotationInfoTree.addContent(hr);
     3.5          Tag[] deprs = annotationType.tags("deprecated");
     3.6          if (Util.isDeprecated(annotationType)) {
     3.7 -            Content strong = HtmlTree.STRONG(deprecatedPhrase);
     3.8 +            Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase);
     3.9              Content div = HtmlTree.DIV(HtmlStyle.block, strong);
    3.10              if (deprs.length > 0) {
    3.11                  Tag[] commentTags = deprs[0].inlineTags();

     4.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Wed Aug 07 11:04:07 2013 +0100
     4.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Wed Aug 07 15:00:24 2013 -0700
     4.3 @@ -547,7 +547,7 @@
     4.4          classInfoTree.addContent(hr);
     4.5          Tag[] deprs = classDoc.tags("deprecated");
     4.6          if (Util.isDeprecated(classDoc)) {
     4.7 -            Content strong = HtmlTree.STRONG(deprecatedPhrase);
     4.8 +            Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase);
     4.9              Content div = HtmlTree.DIV(HtmlStyle.block, strong);
    4.10              if (deprs.length > 0) {
    4.11                  Tag[] commentTags = deprs[0].inlineTags();

     5.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java	Wed Aug 07 11:04:07 2013 +0100
     5.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java	Wed Aug 07 15:00:24 2013 -0700
     5.3 @@ -222,7 +222,7 @@
     5.4       */
     5.5      protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
     5.6              Content tdSummary) {
     5.7 -        Content strong = HtmlTree.STRONG(
     5.8 +        Content strong = HtmlTree.SPAN(HtmlStyle.strong,
     5.9                  writer.getDocLink(context, (MemberDoc) member, member.name(), false));
    5.10          Content code = HtmlTree.CODE(strong);
    5.11          tdSummary.addContent(code);

     6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java	Wed Aug 07 11:04:07 2013 +0100
     6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java	Wed Aug 07 15:00:24 2013 -0700
     6.3 @@ -139,7 +139,7 @@
     6.4                              holder.typeName() : holder.qualifiedTypeName(),
     6.5                              false);
     6.6                  Content codeLink = HtmlTree.CODE(link);
     6.7 -                Content strong = HtmlTree.STRONG(holder.isClass()?
     6.8 +                Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.isClass()?
     6.9                     writer.descfrmClassLabel : writer.descfrmInterfaceLabel);
    6.10                  strong.addContent(writer.getSpace());
    6.11                  strong.addContent(codeLink);
    6.12 @@ -256,7 +256,7 @@
    6.13       */
    6.14      protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
    6.15              Content tdSummary) {
    6.16 -        Content strong = HtmlTree.STRONG(
    6.17 +        Content strong = HtmlTree.SPAN(HtmlStyle.strong,
    6.18                  writer.getDocLink(context, cd , (MemberDoc) member, member.name(), false));
    6.19          Content code = HtmlTree.CODE(strong);
    6.20          tdSummary.addContent(code);

     7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Wed Aug 07 11:04:07 2013 +0100
     7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Wed Aug 07 15:00:24 2013 -0700
     7.3 @@ -1029,7 +1029,7 @@
     7.4  
     7.5      public Content italicsClassName(ClassDoc cd, boolean qual) {
     7.6          Content name = new StringContent((qual)? cd.qualifiedName(): cd.name());
     7.7 -        return (cd.isInterface())?  HtmlTree.I(name): name;
     7.8 +        return (cd.isInterface())?  HtmlTree.SPAN(HtmlStyle.italic, name): name;
     7.9      }
    7.10  
    7.11      /**
    7.12 @@ -1545,7 +1545,7 @@
    7.13          Content div;
    7.14          Content result = commentTagsToContent(null, doc, tags, first);
    7.15          if (depr) {
    7.16 -            Content italic = HtmlTree.I(result);
    7.17 +            Content italic = HtmlTree.SPAN(HtmlStyle.italic, result);
    7.18              div = HtmlTree.DIV(HtmlStyle.block, italic);
    7.19              htmltree.addContent(div);
    7.20          }

     8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Wed Aug 07 11:04:07 2013 +0100
     8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Wed Aug 07 15:00:24 2013 -0700
     8.3 @@ -159,7 +159,7 @@
     8.4                              holder.typeName() : holder.qualifiedTypeName(),
     8.5                              false);
     8.6                  Content codelLink = HtmlTree.CODE(link);
     8.7 -                Content strong = HtmlTree.STRONG(holder.asClassDoc().isClass()?
     8.8 +                Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.asClassDoc().isClass()?
     8.9                      writer.descfrmClassLabel : writer.descfrmInterfaceLabel);
    8.10                  strong.addContent(writer.getSpace());
    8.11                  strong.addContent(codelLink);
    8.12 @@ -309,7 +309,7 @@
    8.13                  label = writer.specifiedByLabel;
    8.14                  context = LinkInfoImpl.Kind.METHOD_SPECIFIED_BY;
    8.15              }
    8.16 -            Content dt = HtmlTree.DT(HtmlTree.STRONG(label));
    8.17 +            Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, label));
    8.18              dl.addContent(dt);
    8.19              Content overriddenTypeLink =
    8.20                      writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType));
    8.21 @@ -364,7 +364,7 @@
    8.22              Content intfaclink = writer.getLink(new LinkInfoImpl(
    8.23                      writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac));
    8.24              Content codeIntfacLink = HtmlTree.CODE(intfaclink);
    8.25 -            Content dt = HtmlTree.DT(HtmlTree.STRONG(writer.specifiedByLabel));
    8.26 +            Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, writer.specifiedByLabel));
    8.27              dl.addContent(dt);
    8.28              Content methlink = writer.getDocLink(
    8.29                      LinkInfoImpl.Kind.MEMBER, implementedMeth,

     9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java	Wed Aug 07 11:04:07 2013 +0100
     9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java	Wed Aug 07 15:00:24 2013 -0700
     9.3 @@ -164,7 +164,7 @@
     9.4       */
     9.5      protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
     9.6              Content tdSummary) {
     9.7 -        Content strong = HtmlTree.STRONG(
     9.8 +        Content strong = HtmlTree.SPAN(HtmlStyle.strong,
     9.9                  writer.getLink(new LinkInfoImpl(configuration, context, (ClassDoc)member)));
    9.10          Content code = HtmlTree.CODE(strong);
    9.11          tdSummary.addContent(code);

    10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Wed Aug 07 11:04:07 2013 +0100
    10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Wed Aug 07 15:00:24 2013 -0700
    10.3 @@ -183,7 +183,7 @@
    10.4                      printedHeader = true;
    10.5                  }
    10.6                  Content arr_i_name = new StringContent(arr[i].name());
    10.7 -                if (arr[i].isInterface()) arr_i_name = HtmlTree.I(arr_i_name);
    10.8 +                if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.italic, arr_i_name);
    10.9                  Content link = getLink(new LinkInfoImpl(configuration,
   10.10                          LinkInfoImpl.Kind.PACKAGE_FRAME, arr[i]).label(arr_i_name).target("classFrame"));
   10.11                  Content li = HtmlTree.LI(link);

    11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java	Wed Aug 07 11:04:07 2013 +0100
    11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java	Wed Aug 07 15:00:24 2013 -0700
    11.3 @@ -174,7 +174,7 @@
    11.4                      printedHeader = true;
    11.5                  }
    11.6                  Content arr_i_name = new StringContent(arr[i].name());
    11.7 -                if (arr[i].isInterface()) arr_i_name = HtmlTree.I(arr_i_name);
    11.8 +                if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.italic, arr_i_name);
    11.9                  Content link = getLink(new LinkInfoImpl(configuration,
   11.10                          LinkInfoImpl.Kind.PACKAGE_FRAME, arr[i]).label(arr_i_name).target("classFrame"));
   11.11                  Content li = HtmlTree.LI(link);

    12.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java	Wed Aug 07 11:04:07 2013 +0100
    12.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java	Wed Aug 07 15:00:24 2013 -0700
    12.3 @@ -135,7 +135,7 @@
    12.4                              holder.typeName() : holder.qualifiedTypeName(),
    12.5                              false);
    12.6                  Content codeLink = HtmlTree.CODE(link);
    12.7 -                Content strong = HtmlTree.STRONG(holder.isClass()?
    12.8 +                Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.isClass()?
    12.9                     writer.descfrmClassLabel : writer.descfrmInterfaceLabel);
   12.10                  strong.addContent(writer.getSpace());
   12.11                  strong.addContent(codeLink);
   12.12 @@ -252,13 +252,12 @@
   12.13       */
   12.14      protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
   12.15              Content tdSummary) {
   12.16 -        Content strong = HtmlTree.STRONG(
   12.17 -                writer.getDocLink(context,
   12.18 -                        cd,
   12.19 -                        (MemberDoc) member,
   12.20 -                        member.name().substring(0, member.name().lastIndexOf("Property")),
   12.21 -                        false,
   12.22 -                        true));
   12.23 +        Content strong = HtmlTree.SPAN(HtmlStyle.strong,
   12.24 +                writer.getDocLink(context, cd,
   12.25 +                (MemberDoc) member,
   12.26 +                member.name().substring(0, member.name().lastIndexOf("Property")),
   12.27 +                false,
   12.28 +                true));
   12.29  
   12.30          Content code = HtmlTree.CODE(strong);
   12.31          tdSummary.addContent(code);

    13.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Wed Aug 07 11:04:07 2013 +0100
    13.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Wed Aug 07 15:00:24 2013 -0700
    13.3 @@ -175,7 +175,7 @@
    13.4          Tag[] deprs = member.tags("deprecated");
    13.5          Content div;
    13.6          if (Util.isDeprecated((ProgramElementDoc) member)) {
    13.7 -            Content strong = HtmlTree.STRONG(deprecatedPhrase);
    13.8 +            Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase);
    13.9              div = HtmlTree.DIV(HtmlStyle.block, strong);
   13.10              div.addContent(getSpace());
   13.11              if (deprs.length > 0) {
   13.12 @@ -186,7 +186,7 @@
   13.13          } else {
   13.14              ClassDoc cd = ((ProgramElementDoc)member).containingClass();
   13.15              if (cd != null && Util.isDeprecated(cd)) {
   13.16 -                Content strong = HtmlTree.STRONG(deprecatedPhrase);
   13.17 +                Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase);
   13.18                  div = HtmlTree.DIV(HtmlStyle.block, strong);
   13.19                  div.addContent(getSpace());
   13.20                  tdSummary.addContent(div);

    14.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java	Wed Aug 07 11:04:07 2013 +0100
    14.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java	Wed Aug 07 15:00:24 2013 -0700
    14.3 @@ -118,7 +118,7 @@
    14.4                  if (deprs.length > 0) {
    14.5                      Content body = commentTagsToOutput(null, doc,
    14.6                          deprs[0].inlineTags(), false);
    14.7 -                    result.addContent(HtmlTree.I(body));
    14.8 +                    result.addContent(HtmlTree.SPAN(HtmlStyle.italic, body));
    14.9                  }
   14.10              } else {
   14.11                  if (Util.isDeprecated(member.containingClass())) {

    15.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java	Wed Aug 07 11:04:07 2013 +0100
    15.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java	Wed Aug 07 15:00:24 2013 -0700
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it
   15.10 @@ -59,6 +59,7 @@
   15.11      indexContainer,
   15.12      indexHeader,
   15.13      inheritance,
   15.14 +    italic,
   15.15      legalCopy,
   15.16      nameValue,
   15.17      navBarCell1Rev,

    16.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java	Wed Aug 07 11:04:07 2013 +0100
    16.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java	Wed Aug 07 15:00:24 2013 -0700
    16.3 @@ -416,17 +416,6 @@
    16.4      }
    16.5  
    16.6      /**
    16.7 -     * Generates a I tag with some content.
    16.8 -     *
    16.9 -     * @param body content for the tag
   16.10 -     * @return an HtmlTree object for the I tag
   16.11 -     */
   16.12 -    public static HtmlTree I(Content body) {
   16.13 -        HtmlTree htmltree = new HtmlTree(HtmlTag.I, nullCheck(body));
   16.14 -        return htmltree;
   16.15 -    }
   16.16 -
   16.17 -    /**
   16.18       * Generates a LI tag with some content.
   16.19       *
   16.20       * @param body content for the tag
   16.21 @@ -559,17 +548,6 @@
   16.22      }
   16.23  
   16.24      /**
   16.25 -     * Generates a STRONG tag with some content.
   16.26 -     *
   16.27 -     * @param body content for the tag
   16.28 -     * @return an HtmlTree object for the STRONG tag
   16.29 -     */
   16.30 -    public static HtmlTree STRONG(Content body) {
   16.31 -        HtmlTree htmltree = new HtmlTree(HtmlTag.STRONG, nullCheck(body));
   16.32 -        return htmltree;
   16.33 -    }
   16.34 -
   16.35 -    /**
   16.36       * Generates a SPAN tag with some content.
   16.37       *
   16.38       * @param body content for the tag

    17.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Aug 07 11:04:07 2013 +0100
    17.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Aug 07 15:00:24 2013 -0700
    17.3 @@ -519,3 +519,6 @@
    17.4  .strong {
    17.5      font-weight:bold;
    17.6  }
    17.7 +.italic {
    17.8 +    font-style:italic;
    17.9 +}

    18.1 --- a/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java	Wed Aug 07 11:04:07 2013 +0100
    18.2 +++ b/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java	Wed Aug 07 15:00:24 2013 -0700
    18.3 @@ -1,5 +1,5 @@
    18.4  /*
    18.5 - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
    18.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    18.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.8   *
    18.9   * This code is free software; you can redistribute it and/or modify it
   18.10 @@ -48,7 +48,7 @@
   18.11              "<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/math/BigInteger.html?is-external=true#gcd(java.math.BigInteger)\" " +
   18.12                  "title=\"class or interface in java.math\"><code>Link to external member gcd</code></a>"},
   18.13          {BUG_ID + FS + "C.html",
   18.14 -            "<dl>" + NL + "<dt><strong>Overrides:</strong></dt>" + NL +
   18.15 +            "<dl>" + NL + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   18.16              "<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>" + NL +
   18.17              "</dl>"}
   18.18      };

    19.1 --- a/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java	Wed Aug 07 11:04:07 2013 +0100
    19.2 +++ b/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java	Wed Aug 07 15:00:24 2013 -0700
    19.3 @@ -1,5 +1,5 @@
    19.4  /*
    19.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    19.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    19.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.8   *
    19.9   * This code is free software; you can redistribute it and/or modify it
   19.10 @@ -39,13 +39,13 @@
   19.11      private static final String BUG_ID = "4857717";
   19.12      private static final String[][] TEST = {
   19.13          {BUG_ID + FS + "pkg" + FS + "XReader.html",
   19.14 -            "<dt><strong>Overrides:</strong></dt>" + NL +
   19.15 +            "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   19.16              "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true#read()\" " +
   19.17              "title=\"class or interface in java.io\">read</a></code>&nbsp;in class&nbsp;<code>" +
   19.18              "<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true\" " +
   19.19              "title=\"class or interface in java.io\">FilterReader</a></code></dd>"},
   19.20          {BUG_ID + FS + "pkg" + FS + "XReader.html",
   19.21 -            "<dt><strong>Specified by:</strong></dt>" + NL +
   19.22 +            "<dt><span class=\"strong\">Specified by:</span></dt>" + NL +
   19.23              "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true#readInt()\" " +
   19.24              "title=\"class or interface in java.io\">readInt</a></code>&nbsp;in interface&nbsp;<code>" +
   19.25              "<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true\" " +

    20.1 --- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Wed Aug 07 11:04:07 2013 +0100
    20.2 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Wed Aug 07 15:00:24 2013 -0700
    20.3 @@ -94,18 +94,18 @@
    20.4                   "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
    20.5                   "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
    20.6          {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" +
    20.7 -                 "&nbsp;<i>As of JDK version 1.5, replaced by" + NL +
    20.8 +                 "&nbsp;<span class=\"italic\">As of JDK version 1.5, replaced by" + NL +
    20.9                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   20.10 -                 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL +
   20.11 +                 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
   20.12                   "<div class=\"block\">This field indicates whether the C1 is " +
   20.13                   "undecorated.</div>" + NL + "&nbsp;" + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL +
   20.14                   "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" +
   20.15                   "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   20.16                   "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
   20.17          {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" +
   20.18 -                 "&nbsp;<i>As of JDK version 1.5, replaced by" + NL +
   20.19 +                 "&nbsp;<span class=\"italic\">As of JDK version 1.5, replaced by" + NL +
   20.20                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   20.21 -                 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL +
   20.22 +                 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
   20.23                   "<div class=\"block\">Reads the object stream.</div>" + NL +
   20.24                   "<dl>" + NL + "<dt><span class=\"strong\">Throws:" +
   20.25                   "</span></dt>" + NL + "<dd><code><code>" +
   20.26 @@ -153,18 +153,18 @@
   20.27                   "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   20.28                   "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
   20.29          {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" +
   20.30 -                 "&nbsp;<i>As of JDK version 1.5, replaced by" + NL +
   20.31 +                 "&nbsp;<span class=\"italic\">As of JDK version 1.5, replaced by" + NL +
   20.32                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   20.33 -                 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL +
   20.34 +                 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
   20.35                   "<div class=\"block\">This field indicates whether the C1 is " +
   20.36                   "undecorated.</div>" + NL + "&nbsp;" + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL +
   20.37                   "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" +
   20.38                   "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   20.39                   "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
   20.40          {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" +
   20.41 -                 "&nbsp;<i>As of JDK version 1.5, replaced by" + NL +
   20.42 +                 "&nbsp;<span class=\"italic\">As of JDK version 1.5, replaced by" + NL +
   20.43                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   20.44 -                 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL +
   20.45 +                 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
   20.46                   "<div class=\"block\">Reads the object stream.</div>" + NL +
   20.47                   "<dl>" + NL + "<dt><span class=\"strong\">Throws:" +
   20.48                   "</span></dt>" + NL + "<dd><code><code>" +
   20.49 @@ -187,14 +187,14 @@
   20.50                   "APPLICATION_EXCLUDE</pre>" + NL + "</li>"},
   20.51          {BUG_ID + FS + "serialized-form.html", "<pre>boolean " +
   20.52                   "undecorated</pre>" + NL + "<div class=\"block\"><span class=\"strong\">" +
   20.53 -                 "Deprecated.</span>&nbsp;<i>As of JDK version 1.5, replaced by" + NL +
   20.54 +                 "Deprecated.</span>&nbsp;<span class=\"italic\">As of JDK version 1.5, replaced by" + NL +
   20.55                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>" +
   20.56 -                 "setUndecorated(boolean)</code></a>.</i></div>" + NL + "</li>"},
   20.57 +                 "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"},
   20.58          {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" +
   20.59 -                 "Deprecated.</span>&nbsp;<i>As of JDK version" +
   20.60 +                 "Deprecated.</span>&nbsp;<span class=\"italic\">As of JDK version" +
   20.61                   " 1.5, replaced by" + NL +
   20.62                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   20.63 -                 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + "</li>"}};
   20.64 +                 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}};
   20.65  
   20.66      // Test for valid HTML generation which should not comprise of empty
   20.67      // definition list tags.

    21.1 --- a/test/com/sun/javadoc/testInterface/TestInterface.java	Wed Aug 07 11:04:07 2013 +0100
    21.2 +++ b/test/com/sun/javadoc/testInterface/TestInterface.java	Wed Aug 07 15:00:24 2013 -0700
    21.3 @@ -1,5 +1,5 @@
    21.4  /*
    21.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    21.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    21.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.8   *
    21.9   * This code is free software; you can redistribute it and/or modify it
   21.10 @@ -83,7 +83,7 @@
   21.11          },
   21.12          //Make sure "Specified By" has substituted type parameters.
   21.13          {BUG_ID + FS + "pkg" + FS + "Child.html",
   21.14 -            "<dt><strong>Specified by:</strong></dt>" + NL +
   21.15 +            "<dt><span class=\"strong\">Specified by:</span></dt>" + NL +
   21.16              "<dd><code><a href=\"../pkg/Interface.html#method()\">method</a>" +
   21.17              "</code>&nbsp;in interface&nbsp;<code>" +
   21.18              "<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" +
   21.19 @@ -92,7 +92,7 @@
   21.20           },
   21.21          //Make sure "Overrides" has substituted type parameters.
   21.22          {BUG_ID + FS + "pkg" + FS + "Child.html",
   21.23 -            "<dt><strong>Overrides:</strong></dt>" + NL +
   21.24 +            "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   21.25              "<dd><code><a href=\"../pkg/Parent.html#method()\">method</a>" +
   21.26              "</code>&nbsp;in class&nbsp;<code><a href=\"../pkg/Parent.html\" " +
   21.27              "title=\"class in pkg\">Parent</a>&lt;<a href=\"../pkg/Child.html\" " +

    22.1 --- a/test/com/sun/javadoc/testJavaFX/TestJavaFX.java	Wed Aug 07 11:04:07 2013 +0100
    22.2 +++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java	Wed Aug 07 15:00:24 2013 -0700
    22.3 @@ -49,7 +49,7 @@
    22.4                  "<div class=\"block\">Gets the value of the property rate.</div>" + NL +
    22.5                  "<dl>" + NL + "<dt><span class=\"strong\">Property description:</span></dt>" },
    22.6              {"./" + BUG_ID + "/C.html",
    22.7 -                "<td class=\"colLast\"><code><strong><a href=\"C.html#rateProperty\">rate</a></strong></code>" + NL +
    22.8 +                "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#rateProperty\">rate</a></span></code>" + NL +
    22.9                  "<div class=\"block\">Defines the direction/speed at which the <code>Timeline</code> is expected to"},
   22.10  
   22.11              {"./" + BUG_ID + "/C.html",
   22.12 @@ -63,7 +63,7 @@
   22.13              {"./" + BUG_ID + "/C.html",
   22.14                  "<span class=\"strong\">Property description:</span>"},
   22.15              {"./" + BUG_ID + "/C.html",
   22.16 -                "<td class=\"colLast\"><code><strong><a href=\"C.html#setTestMethodProperty()\">setTestMethodProperty</a></strong>()</code>&nbsp;</td>" },
   22.17 +                "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#setTestMethodProperty()\">setTestMethodProperty</a></span>()</code>&nbsp;</td>" },
   22.18              {"./" + BUG_ID + "/C.html",
   22.19                  "<h4>isPaused</h4>" + NL +
   22.20                  "<pre>public final&nbsp;double&nbsp;isPaused()</pre>" + NL +

    23.1 --- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Wed Aug 07 11:04:07 2013 +0100
    23.2 +++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Wed Aug 07 15:00:24 2013 -0700
    23.3 @@ -1,5 +1,5 @@
    23.4  /*
    23.5 - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
    23.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    23.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.8   *
    23.9   * This code is free software; you can redistribute it and/or modify it
   23.10 @@ -72,7 +72,7 @@
   23.11  
   23.12           // Test overriding/implementing methods with generic parameters.
   23.13                   {BUG_ID + FS + "pkg" + FS + "BaseClass.html",
   23.14 -         "<dl>" + NL + "<dt><strong>Specified by:</strong></dt>" + NL +
   23.15 +         "<dl>" + NL + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL +
   23.16                            "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">" +
   23.17                            "getAnnotation</a></code>&nbsp;in interface&nbsp;<code>" +
   23.18                            "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +

    24.1 --- a/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java	Wed Aug 07 11:04:07 2013 +0100
    24.2 +++ b/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java	Wed Aug 07 15:00:24 2013 -0700
    24.3 @@ -1,5 +1,5 @@
    24.4  /*
    24.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    24.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    24.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.8   *
    24.9   * This code is free software; you can redistribute it and/or modify it
   24.10 @@ -49,8 +49,8 @@
   24.11          // Check return type in member summary.
   24.12          {BUG_ID + FS + "pkg" + FS + "PublicChild.html",
   24.13              "<code><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>" + NL +
   24.14 -            "<td class=\"colLast\"><code><strong><a href=\"../pkg/PublicChild.html#returnTypeTest()\">" +
   24.15 -            "returnTypeTest</a></strong>()</code>"
   24.16 +            "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../pkg/PublicChild.html#returnTypeTest()\">" +
   24.17 +            "returnTypeTest</a></span>()</code>"
   24.18          },
   24.19          // Check return type in member detail.
   24.20          {BUG_ID + FS + "pkg" + FS + "PublicChild.html",

    25.1 --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Wed Aug 07 11:04:07 2013 +0100
    25.2 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Wed Aug 07 15:00:24 2013 -0700
    25.3 @@ -62,7 +62,7 @@
    25.4                       "</span><span class=\"tabEnd\">&nbsp;</span></caption>"},
    25.5              //Detail for enum constant
    25.6              {BUG_ID + FS + "pkg" + FS + "Coin.html",
    25.7 -                "<strong><a href=\"../pkg/Coin.html#Dime\">Dime</a></strong>"},
    25.8 +                "<span class=\"strong\"><a href=\"../pkg/Coin.html#Dime\">Dime</a></span>"},
    25.9              //Automatically insert documentation for values() and valueOf().
   25.10              {BUG_ID + FS + "pkg" + FS + "Coin.html",
   25.11                  "Returns an array containing the constants of this enum type,"},
   25.12 @@ -320,11 +320,11 @@
   25.13                       "Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
   25.14              },
   25.15              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   25.16 -                     "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest1.html\" " +
   25.17 +                     "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest1.html\" " +
   25.18                       "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends " +
   25.19                       "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" +
   25.20                       "</a> &amp; <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" +
   25.21 -                     "Foo2</a>&gt;</strong></code>&nbsp;</td>"
   25.22 +                     "Foo2</a>&gt;</span></code>&nbsp;</td>"
   25.23              },
   25.24              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   25.25                       "<caption><span>Methods in <a href=\"../../pkg2/" +
   25.26 @@ -334,8 +334,8 @@
   25.27              },
   25.28              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   25.29                       "<td class=\"colLast\"><span class=\"strong\">ClassUseTest1." +
   25.30 -                     "</span><code><strong><a href=\"../../pkg2/" +
   25.31 -                     "ClassUseTest1.html#method(T)\">method</a></strong>" +
   25.32 +                     "</span><code><span class=\"strong\"><a href=\"../../pkg2/" +
   25.33 +                     "ClassUseTest1.html#method(T)\">method</a></span>" +
   25.34                       "(T&nbsp;t)</code>&nbsp;</td>"
   25.35              },
   25.36              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   25.37 @@ -372,11 +372,11 @@
   25.38                      "</span></caption>"
   25.39             },
   25.40             {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
   25.41 -                    "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest1.html\" " +
   25.42 +                    "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest1.html\" " +
   25.43                       "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends " +
   25.44                       "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" +
   25.45                       "</a> &amp; <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" +
   25.46 -                     "Foo2</a>&gt;</strong></code>&nbsp;</td>"
   25.47 +                     "Foo2</a>&gt;</span></code>&nbsp;</td>"
   25.48             },
   25.49             {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
   25.50                      "<caption><span>Methods in <a href=\"../../pkg2/" +
   25.51 @@ -387,8 +387,8 @@
   25.52              },
   25.53              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
   25.54                       "<td class=\"colLast\"><span class=\"strong\">" +
   25.55 -                     "ClassUseTest1.</span><code><strong><a href=\"../../" +
   25.56 -                     "pkg2/ClassUseTest1.html#method(T)\">method</a></strong>" +
   25.57 +                     "ClassUseTest1.</span><code><span class=\"strong\"><a href=\"../../" +
   25.58 +                     "pkg2/ClassUseTest1.html#method(T)\">method</a></span>" +
   25.59                       "(T&nbsp;t)</code>&nbsp;</td>"
   25.60              },
   25.61  
   25.62 @@ -401,11 +401,11 @@
   25.63                       "&nbsp;</span></caption>"
   25.64              },
   25.65              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   25.66 -                     "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest2.html\" " +
   25.67 +                     "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest2.html\" " +
   25.68                       "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends " +
   25.69                       "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" +
   25.70                       "ParamTest</a>&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
   25.71 -                     "Foo3</a>&gt;&gt;</strong></code>&nbsp;</td>"
   25.72 +                     "Foo3</a>&gt;&gt;</span></code>&nbsp;</td>"
   25.73              },
   25.74              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   25.75                       "<caption><span>Methods in <a href=\"../../pkg2/" +
   25.76 @@ -416,8 +416,8 @@
   25.77              },
   25.78              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   25.79                       "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." +
   25.80 -                     "</span><code><strong><a href=\"../../pkg2/" +
   25.81 -                     "ClassUseTest2.html#method(T)\">method</a></strong>" +
   25.82 +                     "</span><code><span class=\"strong\"><a href=\"../../pkg2/" +
   25.83 +                     "ClassUseTest2.html#method(T)\">method</a></span>" +
   25.84                       "(T&nbsp;t)</code>&nbsp;</td>"
   25.85              },
   25.86              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   25.87 @@ -456,11 +456,11 @@
   25.88                       "Foo3</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
   25.89              },
   25.90              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   25.91 -                     "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest2.html\" " +
   25.92 +                     "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest2.html\" " +
   25.93                       "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends " +
   25.94                       "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" +
   25.95                       "ParamTest</a>&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
   25.96 -                     "Foo3</a>&gt;&gt;</strong></code>&nbsp;</td>"
   25.97 +                     "Foo3</a>&gt;&gt;</span></code>&nbsp;</td>"
   25.98              },
   25.99              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
  25.100                       "<caption><span>Methods in <a href=\"../../pkg2/" +
  25.101 @@ -471,8 +471,8 @@
  25.102              },
  25.103              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
  25.104                       "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." +
  25.105 -                     "</span><code><strong><a href=\"../../pkg2/" +
  25.106 -                     "ClassUseTest2.html#method(T)\">method</a></strong>" +
  25.107 +                     "</span><code><span class=\"strong\"><a href=\"../../pkg2/" +
  25.108 +                     "ClassUseTest2.html#method(T)\">method</a></span>" +
  25.109                       "(T&nbsp;t)</code>&nbsp;</td>"
  25.110              },
  25.111              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
  25.112 @@ -500,12 +500,12 @@
  25.113                       "&nbsp;</span></caption>"
  25.114              },
  25.115              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
  25.116 -                     "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest3.html\" " +
  25.117 +                     "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3.html\" " +
  25.118                       "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends " +
  25.119                       "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
  25.120                       "ParamTest2</a>&lt;java.util.List&lt;? extends " +
  25.121                       "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
  25.122 -                     "Foo4</a>&gt;&gt;&gt;</strong></code>&nbsp;</td>"
  25.123 +                     "Foo4</a>&gt;&gt;&gt;</span></code>&nbsp;</td>"
  25.124              },
  25.125              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
  25.126                       "<caption><span>Methods in <a href=\"../../pkg2/" +
  25.127 @@ -516,8 +516,8 @@
  25.128              },
  25.129              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
  25.130                       "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3" +
  25.131 -                     ".</span><code><strong><a href=\"../../pkg2/ClassUseTest3." +
  25.132 -                     "html#method(T)\">method</a></strong>(T&nbsp;t)</code>&nbsp;</td>"
  25.133 +                     ".</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." +
  25.134 +                     "html#method(T)\">method</a></span>(T&nbsp;t)</code>&nbsp;</td>"
  25.135              },
  25.136              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
  25.137                       "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" +
  25.138 @@ -538,12 +538,12 @@
  25.139                       "</span></caption>"
  25.140              },
  25.141              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
  25.142 -                     "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest3.html\" " +
  25.143 +                     "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3.html\" " +
  25.144                       "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends " +
  25.145                       "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
  25.146                       "ParamTest2</a>&lt;java.util.List&lt;? extends " +
  25.147                       "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
  25.148 -                     "Foo4</a>&gt;&gt;&gt;</strong></code>&nbsp;</td>"
  25.149 +                     "Foo4</a>&gt;&gt;&gt;</span></code>&nbsp;</td>"
  25.150              },
  25.151              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
  25.152                       "<caption><span>Methods in <a href=\"../../pkg2/" +
  25.153 @@ -553,8 +553,8 @@
  25.154              },
  25.155              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
  25.156                       "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." +
  25.157 -                     "</span><code><strong><a href=\"../../pkg2/ClassUseTest3." +
  25.158 -                     "html#method(T)\">method</a></strong>(T&nbsp;t)</code>" +
  25.159 +                     "</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." +
  25.160 +                     "html#method(T)\">method</a></span>(T&nbsp;t)</code>" +
  25.161                       "&nbsp;</td>"
  25.162              },
  25.163              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
  25.164 @@ -587,8 +587,8 @@
  25.165                       "</tr>" + NL + "<tbody>" + NL + "<tr class=\"altColor\">" + NL +
  25.166                       "<td class=\"colFirst\"><code>void</code></td>" + NL +
  25.167                       "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." +
  25.168 -                     "</span><code><strong><a href=\"../../pkg2/ClassUseTest3." +
  25.169 -                     "html#method(java.util.Set)\">method</a></strong>(java." +
  25.170 +                     "</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." +
  25.171 +                     "html#method(java.util.Set)\">method</a></span>(java." +
  25.172                       "util.Set&lt;<a href=\"../../pkg2/Foo4.html\" title=\"" +
  25.173                       "class in pkg2\">Foo4</a>&gt;&nbsp;p)</code>&nbsp;</td>" + NL +
  25.174                       "</tr>" + NL + "</tbody>"
  25.175 @@ -698,25 +698,25 @@
  25.176          {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
  25.177              "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Class Annotation\"," + NL +
  25.178              "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
  25.179 -            "public class <strong>AnnotationTypeUsage</strong></dt><dt>extends java.lang.Object</dt>"},
  25.180 +            "public class <span class=\"strong\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>"},
  25.181  
  25.182          //FIELD
  25.183          {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
  25.184              "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Field Annotation\"," + NL +
  25.185              "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
  25.186 -            "public int <strong>field</strong>"},
  25.187 +            "public int <span class=\"strong\">field</span>"},
  25.188  
  25.189          //CONSTRUCTOR
  25.190          {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
  25.191              "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\"," + NL +
  25.192              "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
  25.193 -            "public <strong>AnnotationTypeUsage</strong>()"},
  25.194 +            "public <span class=\"strong\">AnnotationTypeUsage</span>()"},
  25.195  
  25.196          //METHOD
  25.197          {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
  25.198              "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Method Annotation\"," + NL +
  25.199              "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
  25.200 -            "public void <strong>method</strong>()"},
  25.201 +            "public void <span class=\"strong\">method</span>()"},
  25.202  
  25.203          //=================================
  25.204          // Make sure annotation types do not

    26.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Wed Aug 07 11:04:07 2013 +0100
    26.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Wed Aug 07 15:00:24 2013 -0700
    26.3 @@ -1,5 +1,5 @@
    26.4  /*
    26.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    26.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    26.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.8   *
    26.9   * This code is free software; you can redistribute it and/or modify it
   26.10 @@ -46,9 +46,9 @@
   26.11      //Input for string search tests.
   26.12      private static final String[][] TEST = {
   26.13          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   26.14 -            "<strong>Description copied from class:&nbsp;<code>" +
   26.15 +            "<span class=\"strong\">Description copied from class:&nbsp;<code>" +
   26.16              "<a href=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy()\">" +
   26.17 -            "BaseClass</a></code></strong>"
   26.18 +            "BaseClass</a></code></span>"
   26.19          }
   26.20      };
   26.21      private static final String[][] NEGATED_TEST = NO_TEST;

    27.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Wed Aug 07 11:04:07 2013 +0100
    27.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Wed Aug 07 15:00:24 2013 -0700
    27.3 @@ -1,5 +1,5 @@
    27.4  /*
    27.5 - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
    27.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    27.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    27.8   *
    27.9   * This code is free software; you can redistribute it and/or modify it
   27.10 @@ -40,12 +40,12 @@
   27.11      private static final String[][] TEST = {
   27.12          //The public method should be overriden
   27.13          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   27.14 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   27.15 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   27.16                   "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"},
   27.17  
   27.18          //The public method in different package should be overriden
   27.19          {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
   27.20 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   27.21 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   27.22                   "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"}
   27.23      };
   27.24  
   27.25 @@ -54,23 +54,23 @@
   27.26          //The package private method should be overriden since the base and sub class are in the same
   27.27          //package.  However, the link should not show up because the package private methods are not documented.
   27.28          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   27.29 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   27.30 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   27.31                   "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"},
   27.32  
   27.33          //The private method in should not be overriden
   27.34          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   27.35 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   27.36 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   27.37                   "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"},
   27.38  
   27.39          //The private method in different package should not be overriden
   27.40          {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
   27.41 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   27.42 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   27.43                   "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"},
   27.44  
   27.45          //The package private method should not be overriden since the base and sub class are in
   27.46          //different packages.
   27.47          {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
   27.48 -         "Overrides:</strong></dt><dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}
   27.49 +         "Overrides:</span></dt><dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}
   27.50      };
   27.51  
   27.52      private static final String[] ARGS =

    28.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java	Wed Aug 07 11:04:07 2013 +0100
    28.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java	Wed Aug 07 15:00:24 2013 -0700
    28.3 @@ -1,5 +1,5 @@
    28.4  /*
    28.5 - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
    28.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    28.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.8   *
    28.9   * This code is free software; you can redistribute it and/or modify it
   28.10 @@ -40,14 +40,14 @@
   28.11      private static final String[][] TEST = {
   28.12          //The public method should be overriden
   28.13          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   28.14 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   28.15 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   28.16                   "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod()\">" +
   28.17                   "publicMethod</a></code>&nbsp;in class&nbsp;<code>" +
   28.18                   "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"},
   28.19  
   28.20          //The public method in different package should be overriden
   28.21          {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
   28.22 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   28.23 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   28.24                   "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod()\">" +
   28.25                   "publicMethod</a></code>&nbsp;in class&nbsp;<code>" +
   28.26                   "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"},
   28.27 @@ -55,7 +55,7 @@
   28.28          //The package private method should be overriden since the base and sub class are in the same
   28.29          //package.
   28.30          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   28.31 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   28.32 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   28.33                   "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">" +
   28.34                   "packagePrivateMethod</a></code>&nbsp;in class&nbsp;<code>" +
   28.35                   "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"}
   28.36 @@ -65,18 +65,18 @@
   28.37  
   28.38          //The private method in should not be overriden
   28.39          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   28.40 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   28.41 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   28.42                   "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">"},
   28.43  
   28.44          //The private method in different package should not be overriden
   28.45          {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
   28.46 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   28.47 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   28.48                   "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">"},
   28.49  
   28.50          //The package private method should not be overriden since the base and sub class are in
   28.51          //different packages.
   28.52          {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
   28.53 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   28.54 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   28.55                   "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">"},
   28.56      };
   28.57  

    29.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Wed Aug 07 11:04:07 2013 +0100
    29.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Wed Aug 07 15:00:24 2013 -0700
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
    29.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it
   29.10 @@ -40,18 +40,18 @@
   29.11      private static final String[][] TEST = {
   29.12          //The public method should be overriden
   29.13          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   29.14 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   29.15 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   29.16                   "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"},
   29.17  
   29.18          //The package private method should be overriden since the base and sub class are in the same
   29.19          //package.
   29.20          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   29.21 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   29.22 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   29.23                   "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"},
   29.24  
   29.25          //The public method in different package should be overriden
   29.26          {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
   29.27 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   29.28 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   29.29                   "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"},
   29.30      };
   29.31  
   29.32 @@ -59,18 +59,18 @@
   29.33  
   29.34          //The private method in should not be overriden
   29.35          {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
   29.36 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   29.37 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   29.38                   "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"},
   29.39  
   29.40          //The private method in different package should not be overriden
   29.41          {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
   29.42 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   29.43 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   29.44                   "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"},
   29.45  
   29.46          //The package private method should not be overriden since the base and sub class are in
   29.47          //different packages.
   29.48          {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
   29.49 -         "<dt><strong>Overrides:</strong></dt>" + NL +
   29.50 +         "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   29.51                   "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}
   29.52  
   29.53  

    30.1 --- a/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java	Wed Aug 07 11:04:07 2013 +0100
    30.2 +++ b/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java	Wed Aug 07 15:00:24 2013 -0700
    30.3 @@ -1,5 +1,5 @@
    30.4  /*
    30.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    30.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    30.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.8   *
    30.9   * This code is free software; you can redistribute it and/or modify it
   30.10 @@ -50,7 +50,8 @@
   30.11      private static final String[][] TEST1 = {
   30.12          {BUG_ID + "-1" + FS + "pkg1" + FS + "package-summary.html",
   30.13              "<div class=\"deprecatedContent\"><span class=\"strong\">Deprecated.</span>" + NL +
   30.14 -            "<div class=\"block\"><i>This package is Deprecated.</i></div>"
   30.15 +            "<div class=\"block\"><span class=\"italic\">This package is Deprecated." +
   30.16 +            "</span></div>"
   30.17          },
   30.18          {BUG_ID + "-1" + FS + "deprecated-list.html",
   30.19              "<li><a href=\"#package\">Deprecated Packages</a></li>"

    31.1 --- a/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Wed Aug 07 11:04:07 2013 +0100
    31.2 +++ b/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Wed Aug 07 15:00:24 2013 -0700
    31.3 @@ -112,12 +112,12 @@
    31.4      private static final String[][] NEGATED_TEST1 = {
    31.5         // Should not document that a method overrides method from private class.
    31.6        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
    31.7 -        "<strong>Overrides:</strong>"},
    31.8 +        "<span class=\"strong\">Overrides:</span>"},
    31.9        // Should not document that a method specified by private interface.
   31.10        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
   31.11 -        "<strong>Specified by:</strong>"},
   31.12 +        "<span class=\"strong\">Specified by:</span>"},
   31.13        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
   31.14 -        "<strong>Specified by:</strong>"},
   31.15 +        "<span class=\"strong\">Specified by:</span>"},
   31.16        // Should not mention that any documentation was copied.
   31.17        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
   31.18          "Description copied from"},
   31.19 @@ -139,7 +139,7 @@
   31.20          //Do not inherit private interface method with generic parameters.
   31.21          //This method has been implemented.
   31.22          {BUG_ID + "-1" + FS + "pkg2" + FS + "C.html",
   31.23 -            "<strong><a href=\"../pkg2/I.html#hello(T)\">hello</a></strong>"},
   31.24 +            "<span class=\"strong\"><a href=\"../pkg2/I.html#hello(T)\">hello</a></span>"},
   31.25      };
   31.26  
   31.27      // Test output when -private flag is used.
   31.28 @@ -176,14 +176,14 @@
   31.29          },
   31.30          // Should document that a method overrides method from private class.
   31.31         {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
   31.32 -            "<dt><strong>Overrides:</strong></dt>" + NL +
   31.33 +            "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
   31.34              "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[], int, T, V, java.util.List)\">" +
   31.35              "methodOverridenFromParent</a></code>&nbsp;in class&nbsp;<code>" +
   31.36              "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
   31.37              "PrivateParent</a></code></dd>"},
   31.38         // Should document that a method is specified by private interface.
   31.39         {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
   31.40 -            "<dt><strong>Specified by:</strong></dt>" + NL +
   31.41 +            "<dt><span class=\"strong\">Specified by:</span></dt>" + NL +
   31.42              "<dd><code><a href=\"../pkg/PrivateInterface.html#methodInterface(int)\">" +
   31.43              "methodInterface</a></code>&nbsp;in interface&nbsp;<code>" +
   31.44              "<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
   31.45 @@ -227,11 +227,11 @@
   31.46        //Since private flag is used, we can document that private interface method
   31.47        //with generic parameters has been implemented.
   31.48        {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
   31.49 -            "<strong>Description copied from interface:&nbsp;<code>" +
   31.50 -            "<a href=\"../pkg2/I.html#hello(T)\">I</a></code></strong>"},
   31.51 +            "<span class=\"strong\">Description copied from interface:&nbsp;<code>" +
   31.52 +            "<a href=\"../pkg2/I.html#hello(T)\">I</a></code></span>"},
   31.53  
   31.54        {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
   31.55 -            "<dt><strong>Specified by:</strong></dt>" + NL +
   31.56 +            "<dt><span class=\"strong\">Specified by:</span></dt>" + NL +
   31.57              "<dd><code><a href=\"../pkg2/I.html#hello(T)\">hello</a></code>" +
   31.58              "&nbsp;in interface&nbsp;<code>" +
   31.59              "<a href=\"../pkg2/I.html\" title=\"interface in pkg2\">I</a>" +

    32.1 --- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Wed Aug 07 11:04:07 2013 +0100
    32.2 +++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Wed Aug 07 15:00:24 2013 -0700
    32.3 @@ -47,9 +47,9 @@
    32.4                   "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
    32.5                   "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
    32.6          {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" +
    32.7 -                 "&nbsp;<i>As of JDK version 1.5, replaced by" + NL +
    32.8 +                 "&nbsp;<span class=\"italic\">As of JDK version 1.5, replaced by" + NL +
    32.9                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   32.10 -                 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL +
   32.11 +                 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
   32.12                   "<div class=\"block\">This field indicates whether the C1 " +
   32.13                   "is undecorated.</div>" + NL + "&nbsp;" + NL +
   32.14                   "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL +
   32.15 @@ -57,9 +57,9 @@
   32.16                   "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   32.17                   "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
   32.18          {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" +
   32.19 -                 "&nbsp;<i>As of JDK version 1.5, replaced by" + NL +
   32.20 +                 "&nbsp;<span class=\"italic\">As of JDK version 1.5, replaced by" + NL +
   32.21                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   32.22 -                 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL +
   32.23 +                 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
   32.24                   "<div class=\"block\">Reads the object stream.</div>" + NL +
   32.25                   "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code><code>" +
   32.26                   "IOException</code></code></dd>" + NL +
   32.27 @@ -73,15 +73,15 @@
   32.28      // information if any.
   32.29      private static final String[][] TEST_NOCMNT = {
   32.30          {BUG_ID + FS + "serialized-form.html", "<pre>boolean undecorated</pre>" + NL +
   32.31 -                 "<div class=\"block\"><span class=\"strong\">Deprecated.</span>&nbsp;<i>" +
   32.32 +                 "<div class=\"block\"><span class=\"strong\">Deprecated.</span>&nbsp;<span class=\"italic\">" +
   32.33                   "As of JDK version 1.5, replaced by" + NL +
   32.34                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>" +
   32.35 -                 "setUndecorated(boolean)</code></a>.</i></div>" + NL + "</li>"},
   32.36 +                 "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"},
   32.37          {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" +
   32.38 -                 "Deprecated.</span>&nbsp;<i>As of JDK version" +
   32.39 +                 "Deprecated.</span>&nbsp;<span class=\"italic\">As of JDK version" +
   32.40                   " 1.5, replaced by" + NL +
   32.41                   " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" +
   32.42 -                 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + "</li>"}};
   32.43 +                 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}};
   32.44  
   32.45      // Test with -nodeprecated option. The serialized-form.html should
   32.46      // ignore the -nodeprecated tag and display the deprecation info. This