Wed, 23 Oct 2013 23:02:17 +0200
8027191: Fix for JDK-8026861 refers to an incorrect bug number
Summary: Reverting changeset b05db8c815e8, so that it can be applied again with a correct bug number
Reviewed-by: jjg
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /* |
aoqi@0 | 25 | * @test |
aoqi@0 | 26 | * @bug 7159016 |
aoqi@0 | 27 | * @summary Static import of member in processor-generated class fails in JDK 7 |
aoqi@0 | 28 | * @library lib |
aoqi@0 | 29 | * @build JavacTestingAbstractProcessor |
aoqi@0 | 30 | * @run main T7159016 |
aoqi@0 | 31 | * @author Jessie Glick |
aoqi@0 | 32 | */ |
aoqi@0 | 33 | |
aoqi@0 | 34 | import java.io.File; |
aoqi@0 | 35 | import java.io.FileWriter; |
aoqi@0 | 36 | import java.io.IOException; |
aoqi@0 | 37 | import java.io.Writer; |
aoqi@0 | 38 | import java.util.Collections; |
aoqi@0 | 39 | import java.util.Set; |
aoqi@0 | 40 | import javax.annotation.processing.AbstractProcessor; |
aoqi@0 | 41 | import javax.annotation.processing.RoundEnvironment; |
aoqi@0 | 42 | import javax.annotation.processing.SupportedAnnotationTypes; |
aoqi@0 | 43 | import javax.annotation.processing.SupportedSourceVersion; |
aoqi@0 | 44 | import javax.lang.model.SourceVersion; |
aoqi@0 | 45 | import javax.lang.model.element.TypeElement; |
aoqi@0 | 46 | import javax.tools.Diagnostic; |
aoqi@0 | 47 | import javax.tools.JavaCompiler; |
aoqi@0 | 48 | import javax.tools.ToolProvider; |
aoqi@0 | 49 | |
aoqi@0 | 50 | public class T7159016 { |
aoqi@0 | 51 | public static void main(String[] args) throws Exception { |
aoqi@0 | 52 | File src = new File("C.java"); |
aoqi@0 | 53 | Writer w = new FileWriter(src); |
aoqi@0 | 54 | try { |
aoqi@0 | 55 | w.write("import static p.Generated.m;\nclass C { {m(); } }\n"); |
aoqi@0 | 56 | w.flush(); |
aoqi@0 | 57 | } finally { |
aoqi@0 | 58 | w.close(); |
aoqi@0 | 59 | } |
aoqi@0 | 60 | JavaCompiler jc = ToolProvider.getSystemJavaCompiler(); |
aoqi@0 | 61 | JavaCompiler.CompilationTask task = jc.getTask(null, null, null, null, null, |
aoqi@0 | 62 | jc.getStandardFileManager(null, null, null).getJavaFileObjects(src)); |
aoqi@0 | 63 | task.setProcessors(Collections.singleton(new Proc())); |
aoqi@0 | 64 | if (!task.call()) { |
aoqi@0 | 65 | throw new Error("Test failed"); |
aoqi@0 | 66 | } |
aoqi@0 | 67 | } |
aoqi@0 | 68 | |
aoqi@0 | 69 | private static class Proc extends JavacTestingAbstractProcessor { |
aoqi@0 | 70 | int written; |
aoqi@0 | 71 | @Override public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { |
aoqi@0 | 72 | if (roundEnv.processingOver() || written++ > 0) { |
aoqi@0 | 73 | return false; |
aoqi@0 | 74 | } |
aoqi@0 | 75 | messager.printMessage(Diagnostic.Kind.NOTE, "writing Generated.java"); |
aoqi@0 | 76 | try { |
aoqi@0 | 77 | Writer w = processingEnv.getFiler().createSourceFile("p.Generated").openWriter(); |
aoqi@0 | 78 | try { |
aoqi@0 | 79 | w.write("package p; public class Generated { public static void m() { } }"); |
aoqi@0 | 80 | } finally { |
aoqi@0 | 81 | w.close(); |
aoqi@0 | 82 | } |
aoqi@0 | 83 | } catch (IOException x) { |
aoqi@0 | 84 | messager.printMessage(Diagnostic.Kind.ERROR, x.toString()); |
aoqi@0 | 85 | } |
aoqi@0 | 86 | return true; |
aoqi@0 | 87 | } |
aoqi@0 | 88 | } |
aoqi@0 | 89 | } |