jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java

-:25c89a492f14
+:081d7c72ee92
 this.nosince = nosince;
 this.showversion = showversion;
 this.showauthor = showauthor;
 this.javafx = javafx;
 this.message = message;
-initStandardTags();
+initStandardTaglets();
 initStandardTagsLowercase();
 }
 /**
 * Add a new <code>CustomTag</code>.  This is used to add a Taglet from within
 * Return the array of <code>Taglet</code>s that can
 * appear in packages.
 * @return the array of <code>Taglet</code>s that can
 * appear in packages.
 */
-public Taglet[] getPackageCustomTags() {
+public Taglet[] getPackageCustomTaglets() {
 if (packageTags == null) {
-initCustomTagArrays();
+initCustomTagletArrays();
 }
 return packageTags;
 }
 /**
 * Return the array of <code>Taglet</code>s that can
 * appear in classes or interfaces.
 * @return the array of <code>Taglet</code>s that can
 * appear in classes or interfaces.
 */
-public Taglet[] getTypeCustomTags() {
+public Taglet[] getTypeCustomTaglets() {
 if (typeTags == null) {
-initCustomTagArrays();
+initCustomTagletArrays();
 }
 return typeTags;
 }
 /**
 * Return the array of inline <code>Taglet</code>s that can
 * appear in comments.
 * @return the array of <code>Taglet</code>s that can
 * appear in comments.
 */
-public Taglet[] getInlineCustomTags() {
+public Taglet[] getInlineCustomTaglets() {
 if (inlineTags == null) {
-initCustomTagArrays();
+initCustomTagletArrays();
 }
 return inlineTags;
 }
 /**
 * Return the array of <code>Taglet</code>s that can
 * appear in fields.
 * @return the array of <code>Taglet</code>s that can
 * appear in field.
 */
-public Taglet[] getFieldCustomTags() {
+public Taglet[] getFieldCustomTaglets() {
 if (fieldTags == null) {
-initCustomTagArrays();
+initCustomTagletArrays();
 }
 return fieldTags;
 }
 /**
 * Return the array of <code>Taglet</code>s that can
 * appear in the serialized form.
 * @return the array of <code>Taglet</code>s that can
 * appear in the serialized form.
 */
-public Taglet[] getSerializedFormTags() {
+public Taglet[] getSerializedFormTaglets() {
 if (serializedFormTags == null) {
-initCustomTagArrays();
+initCustomTagletArrays();
 }
 return serializedFormTags;
 }
 /**
 * @return the array of <code>Taglet</code>s that can
 * appear in the given Doc.
 */
-public Taglet[] getCustomTags(Doc doc) {
+public Taglet[] getCustomTaglets(Doc doc) {
 if (doc instanceof ConstructorDoc) {
-return getConstructorCustomTags();
+return getConstructorCustomTaglets();
 } else if (doc instanceof MethodDoc) {
-return getMethodCustomTags();
+return getMethodCustomTaglets();
 } else if (doc instanceof FieldDoc) {
-return getFieldCustomTags();
+return getFieldCustomTaglets();
 } else if (doc instanceof ClassDoc) {
-return getTypeCustomTags();
+return getTypeCustomTaglets();
 } else if (doc instanceof PackageDoc) {
-return getPackageCustomTags();
+return getPackageCustomTaglets();
 } else if (doc instanceof RootDoc) {
-return getOverviewCustomTags();
+return getOverviewCustomTaglets();
 }
 return null;
 }
 /**
 * Return the array of <code>Taglet</code>s that can
 * appear in constructors.
 * @return the array of <code>Taglet</code>s that can
 * appear in constructors.
 */
-public Taglet[] getConstructorCustomTags() {
+public Taglet[] getConstructorCustomTaglets() {
 if (constructorTags == null) {
-initCustomTagArrays();
+initCustomTagletArrays();
 }
 return constructorTags;
 }
 /**
 * Return the array of <code>Taglet</code>s that can
 * appear in methods.
 * @return the array of <code>Taglet</code>s that can
 * appear in methods.
 */
-public Taglet[] getMethodCustomTags() {
+public Taglet[] getMethodCustomTaglets() {
 if (methodTags == null) {
-initCustomTagArrays();
+initCustomTagletArrays();
 }
 return methodTags;
 }
 /**
 * Return the array of <code>Taglet</code>s that can
 * appear in an overview.
 * @return the array of <code>Taglet</code>s that can
 * appear in overview.
 */
-public Taglet[] getOverviewCustomTags() {
+public Taglet[] getOverviewCustomTaglets() {
 if (overviewTags == null) {
-initCustomTagArrays();
+initCustomTagletArrays();
 }
 return overviewTags;
 }
 /**
 * Initialize the custom tag arrays.
 */
-private void initCustomTagArrays() {
+private void initCustomTagletArrays() {
 Iterator<Taglet> it = customTags.values().iterator();
 ArrayList<Taglet> pTags = new ArrayList<Taglet>(customTags.size());
 ArrayList<Taglet> tTags = new ArrayList<Taglet>(customTags.size());
 ArrayList<Taglet> fTags = new ArrayList<Taglet>(customTags.size());
 ArrayList<Taglet> cTags = new ArrayList<Taglet>(customTags.size());
 }
 /**
 * Initialize standard Javadoc tags for ordering purposes.
 */
-private void initStandardTags() {
+private void initStandardTaglets() {
 Taglet temp;
-customTags.put((temp = new ParamTaglet()).getName(), temp);
+addStandardTaglet(new ParamTaglet());
-customTags.put((temp = new ReturnTaglet()).getName(), temp);
+addStandardTaglet(new ReturnTaglet());
-customTags.put((temp = new ThrowsTaglet()).getName(), temp);
+addStandardTaglet(new ThrowsTaglet());
-customTags.put((temp = new SimpleTaglet("exception",
+addStandardTaglet(new SimpleTaglet("exception", null,
-null, SimpleTaglet.METHOD + SimpleTaglet.CONSTRUCTOR)).getName(), temp);
+SimpleTaglet.METHOD + SimpleTaglet.CONSTRUCTOR));
-if (!nosince) {
+addStandardTaglet(!nosince, new SimpleTaglet("since", message.getText("doclet.Since"),
-customTags.put((temp = new SimpleTaglet("since", message.getText("doclet.Since"),
+SimpleTaglet.ALL));
-SimpleTaglet.ALL)).getName(), temp);
+addStandardTaglet(showversion, new SimpleTaglet("version", message.getText("doclet.Version"),
-}
+SimpleTaglet.PACKAGE + SimpleTaglet.TYPE + SimpleTaglet.OVERVIEW));
-if (showversion) {
+addStandardTaglet(showauthor, new SimpleTaglet("author", message.getText("doclet.Author"),
-customTags.put((temp = new SimpleTaglet("version", message.getText("doclet.Version"),
+SimpleTaglet.PACKAGE + SimpleTaglet.TYPE + SimpleTaglet.OVERVIEW));
-SimpleTaglet.PACKAGE + SimpleTaglet.TYPE + SimpleTaglet.OVERVIEW)).getName(), temp);
+addStandardTaglet(new SimpleTaglet("serialData", message.getText("doclet.SerialData"),
-}
+SimpleTaglet.EXCLUDED));
-if (showauthor) {
-customTags.put((temp = new SimpleTaglet("author", message.getText("doclet.Author"),
-SimpleTaglet.PACKAGE + SimpleTaglet.TYPE + SimpleTaglet.OVERVIEW)).getName(), temp);
-}
-customTags.put((temp = new SimpleTaglet("serialData", message.getText("doclet.SerialData"),
-SimpleTaglet.EXCLUDED)).getName(), temp);
 customTags.put((temp = new SimpleTaglet("factory", message.getText("doclet.Factory"),
 SimpleTaglet.METHOD)).getName(), temp);
-customTags.put((temp = new SeeTaglet()).getName(), temp);
+addStandardTaglet(new SeeTaglet());
 //Standard inline tags
-customTags.put((temp = new DocRootTaglet()).getName(), temp);
+addStandardTaglet(new DocRootTaglet());
-customTags.put((temp = new InheritDocTaglet()).getName(), temp);
+addStandardTaglet(new InheritDocTaglet());
-customTags.put((temp = new ValueTaglet()).getName(), temp);
+addStandardTaglet(new ValueTaglet());
-customTags.put((temp = new LiteralTaglet()).getName(), temp);
+addStandardTaglet(new LiteralTaglet());
-customTags.put((temp = new CodeTaglet()).getName(), temp);
+addStandardTaglet(new CodeTaglet());
-//Keep track of the names of standard tags for error
+// Keep track of the names of standard tags for error
-//checking purposes.
+// checking purposes. The following are not handled above.
-standardTags.add("param");
+// See, for example, com.sun.tools.javadoc.Comment
-standardTags.add("return");
-standardTags.add("throws");
-standardTags.add("exception");
-standardTags.add("since");
-standardTags.add("version");
-standardTags.add("author");
-standardTags.add("see");
 standardTags.add("deprecated");
 standardTags.add("link");
 standardTags.add("linkplain");
-standardTags.add("inheritDoc");
-standardTags.add("docRoot");
-standardTags.add("value");
 standardTags.add("serial");
-standardTags.add("serialData");
 standardTags.add("serialField");
 standardTags.add("Text");
-standardTags.add("literal");
-standardTags.add("code");
 if (javafx) {
-initJavaFXTags();
+initJavaFXTaglets();
 }
 }
 /**
 * Initialize JavaFX-related tags.
 */
-private void initJavaFXTags() {
+private void initJavaFXTaglets() {
-Taglet temp;
+addStandardTaglet(new PropertyGetterTaglet());
-customTags.put((temp = new PropertyGetterTaglet()).getName(), temp);
+addStandardTaglet(new PropertySetterTaglet());
-customTags.put((temp = new PropertySetterTaglet()).getName(), temp);
+addStandardTaglet(new SimpleTaglet("propertyDescription",
-customTags.put((temp = new SimpleTaglet("propertyDescription", message.getText("doclet.PropertyDescription"),
+message.getText("doclet.PropertyDescription"),
-SimpleTaglet.FIELD + SimpleTaglet.METHOD)).getName(), temp);
+SimpleTaglet.FIELD + SimpleTaglet.METHOD));
-customTags.put((temp = new SimpleTaglet("defaultValue", message.getText("doclet.DefaultValue"),
+addStandardTaglet(new SimpleTaglet("defaultValue", message.getText("doclet.DefaultValue"),
-SimpleTaglet.FIELD + SimpleTaglet.METHOD)).getName(), temp);
+SimpleTaglet.FIELD + SimpleTaglet.METHOD));
-customTags.put((temp = new SimpleTaglet("treatAsPrivate", null,
+addStandardTaglet(new SimpleTaglet("treatAsPrivate", null,
-SimpleTaglet.FIELD + SimpleTaglet.METHOD + SimpleTaglet.TYPE)).getName(), temp);
+SimpleTaglet.FIELD + SimpleTaglet.METHOD + SimpleTaglet.TYPE));
+}
-standardTags.add("propertyGetter");
-standardTags.add("propertySetter");
+void addStandardTaglet(Taglet taglet) {
-standardTags.add("propertyDescription");
+String name = taglet.getName();
-standardTags.add("defaultValue");
+customTags.put(name, taglet);
-standardTags.add("treatAsPrivate");
+standardTags.add(name);
+}
+void addStandardTaglet(boolean enable, Taglet taglet) {
+String name = taglet.getName();
+if (enable)
+customTags.put(name, taglet);
+standardTags.add(name);
 }
 /**
 * Initialize lowercase version of standard Javadoc tags.
 */

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

comparison: src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java

src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java