Wed, 12 Mar 2008 13:06:00 -0700
6668794: javac puts localized text in raw diagnostics
6668796: bad diagnostic "bad class file" given for source files
Summary: Replace internal use of localized text with JCDiagnostic fragments; fix diagnostic for bad source file
Reviewed-by: mcimadamore
duke@1 | 1 | /* |
duke@1 | 2 | * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. |
duke@1 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | * |
duke@1 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@1 | 7 | * published by the Free Software Foundation. |
duke@1 | 8 | * |
duke@1 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 13 | * accompanied this code). |
duke@1 | 14 | * |
duke@1 | 15 | * You should have received a copy of the GNU General Public License version |
duke@1 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 18 | * |
duke@1 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@1 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@1 | 21 | * have any questions. |
duke@1 | 22 | */ |
duke@1 | 23 | |
duke@1 | 24 | /* |
duke@1 | 25 | * @test |
duke@1 | 26 | * @bug 4909767 |
duke@1 | 27 | * @summary Verify that omitting Doclet.languageVersion() hides 1.5 language |
duke@1 | 28 | * features from the doclet. |
duke@1 | 29 | * @compile -source 1.5 LangVers.java |
duke@1 | 30 | * @run main LangVers |
duke@1 | 31 | */ |
duke@1 | 32 | |
duke@1 | 33 | import java.util.List; |
duke@1 | 34 | import com.sun.javadoc.*; |
duke@1 | 35 | |
duke@1 | 36 | public class LangVers extends Doclet { |
duke@1 | 37 | |
duke@1 | 38 | public static void main(String[] args) { |
duke@1 | 39 | String thisFile = "" + |
duke@1 | 40 | new java.io.File(System.getProperty("test.src", "."), |
duke@1 | 41 | "LangVers.java"); |
duke@1 | 42 | |
duke@1 | 43 | if (com.sun.tools.javadoc.Main.execute( |
duke@1 | 44 | "javadoc", |
duke@1 | 45 | "LangVers", |
duke@1 | 46 | new String[] {"-source", "1.5", thisFile}) != 0) |
duke@1 | 47 | throw new Error("Javadoc encountered warnings or errors."); |
duke@1 | 48 | } |
duke@1 | 49 | |
duke@1 | 50 | public static boolean start(RootDoc root) { |
duke@1 | 51 | ClassDoc fishdoc = root.classNamed("LangVers.Fish"); |
duke@1 | 52 | System.out.println(fishdoc); |
duke@1 | 53 | if (fishdoc.isEnum()) { |
duke@1 | 54 | throw new Error("Enums are not hidden."); |
duke@1 | 55 | } |
duke@1 | 56 | |
duke@1 | 57 | for (MethodDoc meth : fishdoc.methods()) { |
duke@1 | 58 | System.out.println(meth); |
duke@1 | 59 | if (meth.flatSignature().indexOf('<') >= 0) { |
duke@1 | 60 | throw new Error("Type parameters are not hidden."); |
duke@1 | 61 | } |
duke@1 | 62 | } |
duke@1 | 63 | |
duke@1 | 64 | return true; |
duke@1 | 65 | } |
duke@1 | 66 | |
duke@1 | 67 | public enum Fish { |
duke@1 | 68 | One, Two, Red, Blue; |
duke@1 | 69 | |
duke@1 | 70 | public void enroll(List<? super Fish> school) { |
duke@1 | 71 | school.add(this); |
duke@1 | 72 | } |
duke@1 | 73 | } |
duke@1 | 74 | } |