[jdk8support] ... and javadoc copying support is back for javac8. Also fixed some copyright headers.

2 files changed, 54 insertions, 25 deletions

diff --git a/src/delombok/lombok/delombok/DocCommentIntegrator.java b/src/delombok/lombok/delombok/DocCommentIntegrator.java
index 80aec16a..c1eb02b6 100644
--- a/src/delombok/lombok/delombok/DocCommentIntegrator.java
+++ b/src/delombok/lombok/delombok/DocCommentIntegrator.java
@@ -8,7 +8,10 @@ import java.util.regex.Pattern;
 
 import lombok.javac.CommentInfo;
 import lombok.javac.Javac;
+import lombok.javac.handlers.JavacHandlerUtil;
 
+import com.sun.tools.javac.parser.Tokens.Comment;
+import com.sun.tools.javac.tree.DocCommentTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCClassDecl;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
@@ -50,7 +53,7 @@ public class DocCommentIntegrator {
 	}
 	
 	private static final Pattern CONTENT_STRIPPER = Pattern.compile("^(?:\\s*\\*)?[ \\t]*(.*?)$", Pattern.MULTILINE);
-	@SuppressWarnings("unchecked") private boolean attach(JCCompilationUnit top, JCTree node, CommentInfo cmt) {
+	@SuppressWarnings("unchecked") private boolean attach(JCCompilationUnit top, final JCTree node, CommentInfo cmt) {
 		String docCommentContent = cmt.content;
 		if (docCommentContent.startsWith("/**")) docCommentContent = docCommentContent.substring(3);
 		if (docCommentContent.endsWith("*/")) docCommentContent = docCommentContent.substring(0, docCommentContent.length() -2);
@@ -63,6 +66,26 @@ public class DocCommentIntegrator {
 		if (map_ instanceof Map) {
 			((Map<JCTree, String>) map_).put(node, docCommentContent);
 			return true;
+		} else if (map_ instanceof DocCommentTable) {
+			final String docCommentContent_ = docCommentContent;
+			((DocCommentTable) map_).putComment(node, new Comment() {
+				@Override public String getText() {
+					return docCommentContent_;
+				}
+				
+				@Override public int getSourcePos(int index) {
+					return -1;
+				}
+				
+				@Override public CommentStyle getStyle() {
+					return CommentStyle.JAVADOC;
+				}
+				
+				@Override public boolean isDeprecated() {
+					return JavacHandlerUtil.nodeHasDeprecatedFlag(node);
+				}
+			});
+			return true;
 		}
 		
 		return false;
diff --git a/src/delombok/lombok/delombok/PrettyCommentsPrinter.java b/src/delombok/lombok/delombok/PrettyCommentsPrinter.java
index 525773f4..67c313ab 100644
--- a/src/delombok/lombok/delombok/PrettyCommentsPrinter.java
+++ b/src/delombok/lombok/delombok/PrettyCommentsPrinter.java
@@ -101,6 +101,7 @@ import com.sun.tools.javac.tree.JCTree.JCWhileLoop;
 import com.sun.tools.javac.tree.JCTree.JCWildcard;
 import com.sun.tools.javac.tree.JCTree.LetExpr;
 import com.sun.tools.javac.tree.JCTree.TypeBoundKind;
+import com.sun.tools.javac.tree.DocCommentTable;
 import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.Convert;
@@ -270,6 +271,13 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
      *  (can be null)
      */
     Map<JCTree, String> docComments = null;
+    DocCommentTable docTable = null;
+    
+    String getJavadocFor(JCTree node) {
+    	if (docComments != null) return docComments.get(node);
+    	if (docTable != null) return docTable.getCommentText(node);
+    	return null;
+    }
     
     /** Align code to be indented to left margin.
      */
@@ -464,31 +472,28 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
      *  @param tree    The tree for which a documentation comment should be printed.
      */
     public void printDocComment(JCTree tree) throws IOException {
-        if (docComments != null) {
-            String dc = docComments.get(tree);
-            if (dc != null) {
-                print("/**"); println();
-                int pos = 0;
-                int endpos = lineEndPos(dc, pos);
-                boolean atStart = true;
-                while (pos < dc.length()) {
-                    String line = dc.substring(pos, endpos);
-                    if (line.trim().isEmpty() && atStart) {
-                        atStart = false;
-                        continue;
-                    }
-                    atStart = false;
-                    align();
-                    print(" *");
-                    if (pos < dc.length() && dc.charAt(pos) > ' ') print(" ");
-                    print(dc.substring(pos, endpos)); println();
-                    pos = endpos + 1;
-                    endpos = lineEndPos(dc, pos);
-                }
-                align(); print(" */"); println();
-                align();
+        String dc = getJavadocFor(tree);
+        if (dc == null) return;
+        print("/**"); println();
+        int pos = 0;
+        int endpos = lineEndPos(dc, pos);
+        boolean atStart = true;
+        while (pos < dc.length()) {
+            String line = dc.substring(pos, endpos);
+            if (line.trim().isEmpty() && atStart) {
+                atStart = false;
+                continue;
             }
+            atStart = false;
+            align();
+            print(" *");
+            if (pos < dc.length() && dc.charAt(pos) > ' ') print(" ");
+            print(dc.substring(pos, endpos)); println();
+            pos = endpos + 1;
+            endpos = lineEndPos(dc, pos);
         }
+        align(); print(" */"); println();
+        align();
     }
 //where
     static int lineEndPos(String s, int start) {
@@ -586,6 +591,7 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
     public void printUnit(JCCompilationUnit tree, JCClassDecl cdef) throws IOException {
         Object dc = getDocComments(tree);
         if (dc instanceof Map) this.docComments = (Map) dc;
+        else if (dc instanceof DocCommentTable) this.docTable = (DocCommentTable) dc;
         printDocComment(tree);
         if (tree.pid != null) {
             consumeComments(tree.pos, tree);
@@ -767,7 +773,7 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
 
     public void visitVarDef(JCVariableDecl tree) {
         try {
-            if (docComments != null && docComments.get(tree) != null) {
+            if (getJavadocFor(tree) != null) {
                 println(); align();
             }
             printDocComment(tree);