Mercurial > jdk8-mips64-public > langtools / file comparison
comparison: src/share/classes/com/sun/tools/javadoc/DocEnv.java
src/share/classes/com/sun/tools/javadoc/DocEnv.java
- changeset 2169
- 667843bd2193
- parent 1998
- b25e387481dc
- child 2201
- ef44a2971cb1
equal
deleted
inserted
replaced
| 2168:119747cd9f25 | 2169:667843bd2193 |
|---|---|
| 798 if ((flags & Flags.VOLATILE) != 0) | 798 if ((flags & Flags.VOLATILE) != 0) |
| 799 result |= Modifier.VOLATILE; | 799 result |= Modifier.VOLATILE; |
| 800 return result; | 800 return result; |
| 801 } | 801 } |
| 802 | 802 |
| 803 void initDoclint(Collection<String> opts) { | 803 void initDoclint(Collection<String> opts, Collection<String> customTagNames) { |
| 804 ArrayList<String> doclintOpts = new ArrayList<String>(); | 804 ArrayList<String> doclintOpts = new ArrayList<String>(); |
| 805 | 805 |
| 806 for (String opt: opts) { | 806 for (String opt: opts) { |
| 807 doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt); | 807 doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt); |
| 808 } | 808 } |
| 811 doclintOpts.add(DocLint.XMSGS_OPTION); | 811 doclintOpts.add(DocLint.XMSGS_OPTION); |
| 812 } else if (doclintOpts.size() == 1 | 812 } else if (doclintOpts.size() == 1 |
| 813 && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) { | 813 && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) { |
| 814 return; | 814 return; |
| 815 } | 815 } |
| 816 | |
| 817 String sep = ""; | |
| 818 StringBuilder customTags = new StringBuilder(); | |
| 819 for (String customTag : customTagNames) { | |
| 820 customTags.append(sep); | |
| 821 customTags.append(customTag); | |
| 822 sep = DocLint.TAGS_SEPARATOR; | |
| 823 } | |
| 824 doclintOpts.add(DocLint.XCUSTOM_TAGS_PREFIX + customTags.toString()); | |
| 816 | 825 |
| 817 JavacTask t = BasicJavacTask.instance(context); | 826 JavacTask t = BasicJavacTask.instance(context); |
| 818 doclint = new DocLint(); | 827 doclint = new DocLint(); |
| 819 // standard doclet normally generates H1, H2 | 828 // standard doclet normally generates H1, H2 |
| 820 doclintOpts.add(DocLint.XIMPLICIT_HEADERS + "2"); | 829 doclintOpts.add(DocLint.XIMPLICIT_HEADERS + "2"); |
