1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Tue May 14 10:14:51 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Tue May 14 10:14:52 2013 -0700 1.3 @@ -116,9 +116,9 @@ 1.4 public Content getNavLinkPrevious() { 1.5 Content li; 1.6 if (prev != null) { 1.7 - Content prevLink = new RawHtml(getLink(new LinkInfoImpl(configuration, 1.8 + Content prevLink = getLink(new LinkInfoImpl(configuration, 1.9 LinkInfoImpl.Kind.CLASS, prev.asClassDoc(), "", 1.10 - configuration.getText("doclet.Prev_Class"), true))); 1.11 + configuration.getText("doclet.Prev_Class"), true)); 1.12 li = HtmlTree.LI(prevLink); 1.13 } 1.14 else 1.15 @@ -134,9 +134,9 @@ 1.16 public Content getNavLinkNext() { 1.17 Content li; 1.18 if (next != null) { 1.19 - Content nextLink = new RawHtml(getLink(new LinkInfoImpl(configuration, 1.20 + Content nextLink = getLink(new LinkInfoImpl(configuration, 1.21 LinkInfoImpl.Kind.CLASS, next.asClassDoc(), "", 1.22 - configuration.getText("doclet.Next_Class"), true))); 1.23 + configuration.getText("doclet.Next_Class"), true)); 1.24 li = HtmlTree.LI(nextLink); 1.25 } 1.26 else 1.27 @@ -167,7 +167,7 @@ 1.28 Content headerContent = new StringContent(header); 1.29 Content heading = HtmlTree.HEADING(HtmlConstants.CLASS_PAGE_HEADING, true, 1.30 HtmlStyle.title, headerContent); 1.31 - heading.addContent(new RawHtml(getTypeParameterLinks(linkInfo))); 1.32 + heading.addContent(getTypeParameterLinks(linkInfo)); 1.33 div.addContent(heading); 1.34 bodyTree.addContent(div); 1.35 return bodyTree; 1.36 @@ -222,7 +222,7 @@ 1.37 LinkInfoImpl linkInfo = new LinkInfoImpl(configuration, 1.38 LinkInfoImpl.Kind.CLASS_SIGNATURE, annotationType, false); 1.39 Content annotationName = new StringContent(annotationType.name()); 1.40 - Content parameterLinks = new RawHtml(getTypeParameterLinks(linkInfo)); 1.41 + Content parameterLinks = getTypeParameterLinks(linkInfo); 1.42 if (configuration.linksource) { 1.43 addSrcLink(annotationType, annotationName, pre); 1.44 pre.addContent(parameterLinks);