Fixed issue 284 now also for java7, introduced more stubbing

2 files changed, 10 insertions, 7 deletions

diff --git a/src/utils/lombok/javac/java6/CommentCollectingParser.java b/src/utils/lombok/javac/java6/CommentCollectingParser.java
index bc33bf71..0915bbb8 100644
--- a/src/utils/lombok/javac/java6/CommentCollectingParser.java
+++ b/src/utils/lombok/javac/java6/CommentCollectingParser.java
@@ -6,6 +6,7 @@ import lombok.javac.Comment;
 
 import com.sun.tools.javac.parser.EndPosParser;
 import com.sun.tools.javac.parser.Lexer;
+import com.sun.tools.javac.parser.Parser;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.util.List;
 
@@ -13,12 +14,11 @@ class CommentCollectingParser extends EndPosParser {
 	
 	private final Map<JCCompilationUnit, List<Comment>> commentsMap;
 	private final Lexer lexer;
-
-	protected CommentCollectingParser(Factory fac, Lexer S, boolean keepDocComments, Map<JCCompilationUnit, List<Comment>> commentsMap) {
+	
+	protected CommentCollectingParser(Parser.Factory fac, Lexer S, boolean keepDocComments, Map<JCCompilationUnit, List<Comment>> commentsMap) {
 		super(fac, S, keepDocComments);
 		lexer = S;
 		this.commentsMap = commentsMap;
-		
 	}
 	
 	@Override public JCCompilationUnit compilationUnit() {
diff --git a/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java b/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java
index ef8b22c4..074f956e 100644
--- a/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java
+++ b/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java
@@ -13,9 +13,8 @@ import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.List;
 
 public class CommentCollectingParserFactory extends Parser.Factory {
-	
 	private final Map<JCCompilationUnit, List<Comment>> commentsMap;
-
+	
 	static Context.Key<Parser.Factory> key() {
 		return parserFactoryKey;
 	}
@@ -26,7 +25,11 @@ public class CommentCollectingParserFactory extends Parser.Factory {
 	}
 	
 	@Override public Parser newParser(Lexer S, boolean keepDocComments, boolean genEndPos) {
-		return new CommentCollectingParser(this, S, keepDocComments, commentsMap);
+		Object x = new CommentCollectingParser(this, S, keepDocComments, commentsMap);
+		return (Parser) x;
+		// CCP is based on a stub which extends nothing, but at runtime the stub is replaced with either
+		//javac6's EndPosParser which extends Parser, or javac7's EndPosParser which implements Parser.
+		//Either way this will work out.
 	}
 	
 	public static void setInCompiler(JavaCompiler compiler, Context context, Map<JCCompilationUnit, List<Comment>> commentsMap) {
@@ -38,6 +41,6 @@ public class CommentCollectingParserFactory extends Parser.Factory {
 			field.set(compiler, new CommentCollectingParserFactory(context, commentsMap));
 		} catch (Exception e) {
 			throw new IllegalStateException("Could not set comment sensitive parser in the compiler", e);
-		} 
+		}
 	}
 }
\ No newline at end of file