Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

4 files changed, 57 insertions, 31 deletions

diff --git a/src/stubs/com/sun/tools/javac/parser/DocCommentScanner.java b/src/stubs/com/sun/tools/javac/parser/DocCommentScanner.java
new file mode 100644
index 00000000..d461d54b
--- /dev/null
+++ b/src/stubs/com/sun/tools/javac/parser/DocCommentScanner.java
@@ -0,0 +1,25 @@
+/*
+ * These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.
+ */
+package com.sun.tools.javac.parser;
+
+import java.nio.CharBuffer;
+
+public class DocCommentScanner extends Scanner {
+	protected DocCommentScanner(Factory fac, CharBuffer buffer) {
+		super(fac, buffer);
+	}
+	
+	protected DocCommentScanner(Factory fac, char[] input, int inputLength) {
+		super(fac, input, inputLength);
+	}
+	
+	protected DocCommentScanner(ScannerFactory fac, CharBuffer buffer) {
+		super(fac, buffer);
+	}
+	
+	protected DocCommentScanner(ScannerFactory fac, char[] input, int inputLength) {
+		super(fac, input, inputLength);
+	}
+	
+}
diff --git a/src/stubs/com/sun/tools/javac/parser/Scanner.java b/src/stubs/com/sun/tools/javac/parser/Scanner.java
index af94bacc..266208e5 100644
--- a/src/stubs/com/sun/tools/javac/parser/Scanner.java
+++ b/src/stubs/com/sun/tools/javac/parser/Scanner.java
@@ -59,4 +59,11 @@ public class Scanner implements Lexer {
 	public char[] getRawCharacters(int beginIndex, int endIndex) {
 		return null;
 	}
+	
+	public void nextToken() {
+	}
+	
+	public char[] getRawCharacters() {
+		return new char[0];
+	}
 }
diff --git a/src/stubs/com/sun/tools/javac/util/Context.java b/src/stubs/com/sun/tools/javac/util/Context.java
deleted file mode 100644
index 06b8ff4d..00000000
--- a/src/stubs/com/sun/tools/javac/util/Context.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.
- */
-package com.sun.tools.javac.util;
-
-public class Context {
-	public static class Key<T> {
-	}
-	
-	public interface Factory<T> {
-		T make(Context c);
-		T make();
-	}
-	
-	public <T> void put(Key<T> key, Factory<T> fac) {
-	}
-	
-	public <T> void put(Key<T> key, T data) {
-	}
-	
-	public <T> void put(Class<T> clazz, T data) {
-	}
-	
-	public <T> T get(Key<T> key) {
-		return null;
-	}
-	
-	public <T> T get(Class<T> clazz) {
-		return null;
-	}
-}
diff --git a/src/stubs/com/sun/tools/javadoc/DocCommentScanner.java b/src/stubs/com/sun/tools/javadoc/DocCommentScanner.java
new file mode 100644
index 00000000..e2ea9614
--- /dev/null
+++ b/src/stubs/com/sun/tools/javadoc/DocCommentScanner.java
@@ -0,0 +1,25 @@
+/*
+ * These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.
+ */
+package com.sun.tools.javadoc;
+
+import java.nio.CharBuffer;
+
+import com.sun.tools.javac.parser.Scanner;
+import com.sun.tools.javac.util.Context;
+
+public class DocCommentScanner extends Scanner {
+	protected DocCommentScanner(com.sun.tools.javadoc.DocCommentScanner.Factory fac, CharBuffer buffer) {
+		super(fac, buffer);
+	}
+	
+	protected DocCommentScanner(com.sun.tools.javadoc.DocCommentScanner.Factory fac, char[] input, int inputLength) {
+		super(fac, input, inputLength);
+	}
+	
+	public static class Factory extends Scanner.Factory {
+		protected Factory(Context context) {
+			super(context);
+		}
+	}
+}