equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. Oracle designates this |
7 * published by the Free Software Foundation. Oracle designates this |
812 if ((flags & Flags.VOLATILE) != 0) |
812 if ((flags & Flags.VOLATILE) != 0) |
813 result |= Modifier.VOLATILE; |
813 result |= Modifier.VOLATILE; |
814 return result; |
814 return result; |
815 } |
815 } |
816 |
816 |
817 void initDoclint(Collection<String> opts, Collection<String> customTagNames) { |
817 void initDoclint(Collection<String> opts, Collection<String> customTagNames, String htmlVersion) { |
818 ArrayList<String> doclintOpts = new ArrayList<>(); |
818 ArrayList<String> doclintOpts = new ArrayList<>(); |
819 |
819 |
820 for (String opt: opts) { |
820 for (String opt: opts) { |
821 doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt); |
821 doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt); |
822 } |
822 } |
834 customTags.append(sep); |
834 customTags.append(sep); |
835 customTags.append(customTag); |
835 customTags.append(customTag); |
836 sep = DocLint.SEPARATOR; |
836 sep = DocLint.SEPARATOR; |
837 } |
837 } |
838 doclintOpts.add(DocLint.XCUSTOM_TAGS_PREFIX + customTags.toString()); |
838 doclintOpts.add(DocLint.XCUSTOM_TAGS_PREFIX + customTags.toString()); |
|
839 doclintOpts.add(DocLint.XHTML_VERSION_PREFIX + htmlVersion); |
839 |
840 |
840 JavacTask t = BasicJavacTask.instance(context); |
841 JavacTask t = BasicJavacTask.instance(context); |
841 doclint = new DocLint(); |
842 doclint = new DocLint(); |
842 // standard doclet normally generates H1, H2 |
843 // standard doclet normally generates H1, H2 |
843 doclintOpts.add(DocLint.XIMPLICIT_HEADERS + "2"); |
844 doclintOpts.add(DocLint.XIMPLICIT_HEADERS + "2"); |