3 files changed, 95 insertions, 3 deletions
diff --git a/src/utils/lombok/javac/CommentCatcher.java b/src/utils/lombok/javac/CommentCatcher.java
new file mode 100644
index 00000000..3bd64ec7
--- /dev/null
+++ b/src/utils/lombok/javac/CommentCatcher.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2011 The Project Lombok Authors.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.javac;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
+import com.sun.tools.javac.util.Context;
+
+public class CommentCatcher {
+	private final JavaCompiler compiler;
+	private final Map<JCCompilationUnit, List<Comment>> commentsMap;
+	
+	public static CommentCatcher create(Context context) {
+		registerCommentsCollectingScannerFactory(context);
+		JavaCompiler compiler = new JavaCompiler(context);
+		
+		Map<JCCompilationUnit, List<Comment>> commentsMap = new WeakHashMap<JCCompilationUnit, List<Comment>>();
+		setInCompiler(compiler, context, commentsMap);
+		
+		compiler.keepComments = true;
+		compiler.genEndPos = true;
+		
+		return new CommentCatcher(compiler, commentsMap);
+	}
+	
+	private CommentCatcher(JavaCompiler compiler, Map<JCCompilationUnit, List<Comment>> commentsMap) {
+		this.compiler = compiler;
+		this.commentsMap = commentsMap;
+	}
+	
+	public JavaCompiler getCompiler() {
+		return compiler;
+	}
+	
+	public List<Comment> getComments(JCCompilationUnit ast) {
+		List<Comment> list = commentsMap.get(ast);
+		return list == null ? Collections.<Comment>emptyList() : list;
+	}
+	
+	private static void registerCommentsCollectingScannerFactory(Context context) {
+		try {
+			if (JavaCompiler.version().startsWith("1.6")) {
+				Class.forName("lombok.javac.java6.CommentCollectingScannerFactory").getMethod("preRegister", Context.class).invoke(null, context);
+			} else {
+				Class.forName("lombok.javac.java7.CommentCollectingScannerFactory").getMethod("preRegister", Context.class).invoke(null, context);
+			}
+		} catch (Exception e) {
+			if (e instanceof RuntimeException) throw (RuntimeException)e;
+			throw new RuntimeException(e);
+		}
+	}
+	
+	private static void setInCompiler(JavaCompiler compiler, Context context, Map<JCCompilationUnit, List<Comment>> commentsMap) {
+		
+		try {
+			if (JavaCompiler.version().startsWith("1.6")) {
+				Class<?> parserFactory = Class.forName("lombok.javac.java6.CommentCollectingParserFactory");
+				parserFactory.getMethod("setInCompiler",JavaCompiler.class, Context.class, Map.class).invoke(null, compiler, context, commentsMap);
+			} else {
+				Class<?> parserFactory = Class.forName("lombok.javac.java7.CommentCollectingParserFactory");
+				parserFactory.getMethod("setInCompiler",JavaCompiler.class, Context.class, Map.class).invoke(null, compiler, context, commentsMap);
+			}
+		} catch (Exception e) {
+			if (e instanceof RuntimeException) throw (RuntimeException)e;
+			throw new RuntimeException(e);
+		}
+	}
+	
+}
diff --git a/src/utils/lombok/javac/java7/CommentCollectingParser.java b/src/utils/lombok/javac/java7/CommentCollectingParser.java
index 7c3cdc71..54cdb6a9 100644
--- a/src/utils/lombok/javac/java7/CommentCollectingParser.java
+++ b/src/utils/lombok/javac/java7/CommentCollectingParser.java
@@ -1,5 +1,6 @@
 package lombok.javac.java7;
 
+import java.util.List;
 import java.util.Map;
 
 import lombok.javac.Comment;
@@ -8,10 +9,8 @@ import com.sun.tools.javac.parser.EndPosParser;
 import com.sun.tools.javac.parser.Lexer;
 import com.sun.tools.javac.parser.ParserFactory;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.util.List;
 
 class CommentCollectingParser extends EndPosParser {
-	
 	private final Map<JCCompilationUnit, List<Comment>> commentsMap;
 	private final Lexer lexer;
 	
diff --git a/src/utils/lombok/javac/java7/CommentCollectingParserFactory.java b/src/utils/lombok/javac/java7/CommentCollectingParserFactory.java
index 8b93376a..7d8c9537 100644
--- a/src/utils/lombok/javac/java7/CommentCollectingParserFactory.java
+++ b/src/utils/lombok/javac/java7/CommentCollectingParserFactory.java
@@ -1,6 +1,7 @@
 package lombok.javac.java7;
 
 import java.lang.reflect.Field;
+import java.util.List;
 import java.util.Map;
 
 import lombok.javac.Comment;
@@ -12,7 +13,6 @@ import com.sun.tools.javac.parser.ParserFactory;
 import com.sun.tools.javac.parser.ScannerFactory;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.List;
 
 public class CommentCollectingParserFactory extends ParserFactory {
 	private final Map<JCCompilationUnit, List<Comment>> commentsMap;