diff -r 4c43e51433ba -r 7af0fa419a2b src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java Tue May 14 10:14:53 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java Tue May 14 10:14:54 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 @@ -25,8 +25,9 @@ package com.sun.tools.doclets.internal.toolkit.taglets; import java.util.Map; + +import com.sun.javadoc.Doc; import com.sun.javadoc.Tag; -import com.sun.tools.doclets.Taglet; /** @@ -47,60 +48,23 @@ * @since 1.5 */ -public class LiteralTaglet implements Taglet { +public class LiteralTaglet extends BaseInlineTaglet { private static final String NAME = "literal"; - public static void register(Map map) { - map.remove(NAME); - map.put(NAME, new LiteralTaglet()); + public static void register(Map map) { + map.remove(NAME); + map.put(NAME, new LiteralTaglet()); } public String getName() { return NAME; } - public String toString(Tag tag) { - return textToString(tag.text()); - } - - public String toString(Tag[] tags) { return null; } - - public boolean inField() { return false; } - - public boolean inConstructor() { return false; } - - public boolean inMethod() { return false; } - - public boolean inOverview() { return false; } - - public boolean inPackage() { return false; } - - public boolean inType() { return false; } - - public boolean isInlineTag() { return true; } - - /* - * Replace occurrences of the following characters: < > & + /** + * {@inheritDoc} */ - protected static String textToString(String text) { - StringBuilder buf = new StringBuilder(); - for (int i = 0; i < text.length(); i++) { - char c = text.charAt(i); - switch (c) { - case '<': - buf.append("<"); - break; - case '>': - buf.append(">"); - break; - case '&': - buf.append("&"); - break; - default: - buf.append(c); - } - } - return buf.toString(); + public TagletOutput getTagletOutput(Tag tag, TagletWriter writer) { + return writer.literalTagOutput(tag); } }