--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Fri Sep 14 10:15:05 2012 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Fri Sep 14 13:22:59 2012 -0700
@@ -117,7 +117,7 @@
return instance;
}
- private JavacTrees(Context context) {
+ protected JavacTrees(Context context) {
context.put(JavacTrees.class, this);
init(context);
}
@@ -286,7 +286,7 @@
JCCompilationUnit unit = (JCCompilationUnit) path.getCompilationUnit();
- Copier copier = new Copier(treeMaker.forToplevel(unit));
+ Copier copier = createCopier(treeMaker.forToplevel(unit));
Env<AttrContext> env = null;
JCMethodDecl method = null;
@@ -372,10 +372,10 @@
/**
* Makes a copy of a tree, noting the value resulting from copying a particular leaf.
**/
- static class Copier extends TreeCopier<JCTree> {
+ protected static class Copier extends TreeCopier<JCTree> {
JCTree leafCopy = null;
- Copier(TreeMaker M) {
+ protected Copier(TreeMaker M) {
super(M);
}
@@ -388,6 +388,10 @@
}
}
+ protected Copier createCopier(TreeMaker maker) {
+ return new Copier(maker);
+ }
+
/**
* Gets the original type from the ErrorType object.
* @param errorType The errorType for which we want to get the original type.
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Fri Sep 14 10:15:05 2012 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Fri Sep 14 13:22:59 2012 -0700
@@ -87,7 +87,7 @@
/** Create a tree maker with a given toplevel and FIRSTPOS as initial position.
*/
- TreeMaker(JCCompilationUnit toplevel, Names names, Types types, Symtab syms) {
+ protected TreeMaker(JCCompilationUnit toplevel, Names names, Types types, Symtab syms) {
this.pos = Position.FIRSTPOS;
this.toplevel = toplevel;
this.names = names;