stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7196462: JavacProcessingEnvironment should tolerate BasicJavacTask

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2012-09-24 14:04:34 -07:00
parent e4cc1a46cb
commit 55ec94e302
3 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
View File

@ -136,4 +136,11 @@ public class BasicJavacTask extends JavacTask {
throw new IllegalStateException(); throw new IllegalStateException();
} }
/**
* For internal use only. This method will be
* removed without warning.
*/
public void updateContext(Context newContext) {
context = newContext;
}
} }

7
langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
View File

@ -49,7 +49,7 @@ import static javax.tools.StandardLocation.*;
import com.sun.source.util.JavacTask; import com.sun.source.util.JavacTask;
import com.sun.source.util.TaskEvent; import com.sun.source.util.TaskEvent;
import com.sun.tools.javac.api.JavacTaskImpl; import com.sun.tools.javac.api.BasicJavacTask;
import com.sun.tools.javac.api.JavacTrees; import com.sun.tools.javac.api.JavacTrees;
import com.sun.tools.javac.api.MultiTaskListener; import com.sun.tools.javac.api.MultiTaskListener;
import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.*;
@ -1086,10 +1086,11 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
elementUtils.setContext(next); elementUtils.setContext(next);
typeUtils.setContext(next); typeUtils.setContext(next);
JavacTaskImpl task = (JavacTaskImpl) context.get(JavacTask.class); JavacTask task = context.get(JavacTask.class);
if (task != null) { if (task != null) {
next.put(JavacTask.class, task); next.put(JavacTask.class, task);
task.updateContext(next); if (task instanceof BasicJavacTask)
((BasicJavacTask) task).updateContext(next);
} }
JavacTrees trees = context.get(JavacTrees.class); JavacTrees trees = context.get(JavacTrees.class);

44
langtools/test/tools/javac/processing/T7196462.java Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 7196462
* @summary JavacProcessingEnvironment should tolerate BasicJavacTask
* @library ../lib
* @build JavacTestingAbstractProcessor T7196462
* @compile/process -processor T7196462 T7196462.java
*/
import java.util.*;
import javax.annotation.processing.*;
import javax.lang.model.element.*;
import com.sun.source.util.*;
public class T7196462 extends JavacTestingAbstractProcessor {
public boolean process(Set<? extends TypeElement> annos,RoundEnvironment rEnv) {
JavacTask t = JavacTask.instance(processingEnv);
System.err.println(t);
return true;
}
}