diff -r 081d7c72ee92 -r ca8808c88f94 src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java Tue May 14 10:14:56 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java Tue May 14 10:14:57 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,8 @@ package com.sun.tools.doclets.internal.toolkit.taglets; import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.RawHtml; +import com.sun.tools.doclets.internal.toolkit.Content; /** * This taglet acts as a wrapper to enable @@ -115,20 +117,20 @@ /** * {@inheritDoc} */ - public TagletOutput getTagletOutput(Tag tag, TagletWriter writer) + public Content getTagletOutput(Tag tag, TagletWriter writer) throws IllegalArgumentException { - TagletOutput output = writer.getOutputInstance(); - output.setOutput(legacyTaglet.toString(tag)); + Content output = writer.getOutputInstance(); + output.addContent(new RawHtml(legacyTaglet.toString(tag))); return output; } /** * {@inheritDoc} */ - public TagletOutput getTagletOutput(Doc holder, TagletWriter writer) + public Content getTagletOutput(Doc holder, TagletWriter writer) throws IllegalArgumentException { - TagletOutput output = writer.getOutputInstance(); - output.setOutput(legacyTaglet.toString(holder.tags(getName()))); + Content output = writer.getOutputInstance(); + output.addContent(new RawHtml(legacyTaglet.toString(holder.tags(getName())))); return output; } }