3 files changed, 45 insertions, 18 deletions

diff --git a/src/core/lombok/eclipse/EclipseAugments.java b/src/core/lombok/eclipse/EcjAugments.java
index 783e25c9..965c4fb6 100644
--- a/src/core/lombok/eclipse/EclipseAugments.java
+++ b/src/core/lombok/eclipse/EcjAugments.java
@@ -33,8 +33,8 @@ import org.eclipse.jdt.internal.core.SourceMethod;
 
 import lombok.core.FieldAugment;
 
-public final class EclipseAugments {
-	private EclipseAugments() {
+public final class EcjAugments {
+	private EcjAugments() {
 		// Prevent instantiation
 	}
 	
@@ -42,6 +42,13 @@ public final class EclipseAugments {
 	public static final FieldAugment<ASTNode, Boolean> ASTNode_handled = FieldAugment.augment(ASTNode.class, boolean.class, "lombok$handled");
 	public static final FieldAugment<ASTNode, ASTNode> ASTNode_generatedBy = FieldAugment.augment(ASTNode.class, ASTNode.class, "$generatedBy");
 	public static final FieldAugment<Annotation, Boolean> Annotation_applied = FieldAugment.augment(Annotation.class, boolean.class, "lombok$applied");
-	public static final FieldAugment<CompilationUnit, Map<String, String>> CompilationUnit_javadoc = FieldAugment.augment(CompilationUnit.class, Map.class, "$javadoc");
-	public static final FieldAugment<CompilationUnit, ConcurrentMap<String, List<SourceMethod>>> CompilationUnit_delegateMethods = FieldAugment.augment(CompilationUnit.class, ConcurrentMap.class, "$delegateMethods");
+	
+	public static final class EclipseAugments {
+		private EclipseAugments() {
+			// Prevent instantiation
+		}
+		
+		public static final FieldAugment<CompilationUnit, Map<String, String>> CompilationUnit_javadoc = FieldAugment.augment(CompilationUnit.class, Map.class, "$javadoc");
+		public static final FieldAugment<CompilationUnit, ConcurrentMap<String, List<SourceMethod>>> CompilationUnit_delegateMethods = FieldAugment.augment(CompilationUnit.class, ConcurrentMap.class, "$delegateMethods");
+	}
 }
diff --git a/src/core/lombok/eclipse/HandlerLibrary.java b/src/core/lombok/eclipse/HandlerLibrary.java
index 0e72fb38..8d69325e 100644
--- a/src/core/lombok/eclipse/HandlerLibrary.java
+++ b/src/core/lombok/eclipse/HandlerLibrary.java
@@ -23,7 +23,7 @@ package lombok.eclipse;
 
 import static lombok.eclipse.Eclipse.*;
 import static lombok.eclipse.handlers.EclipseHandlerUtil.*;
-import static lombok.eclipse.EclipseAugments.ASTNode_handled;
+import static lombok.eclipse.EcjAugments.ASTNode_handled;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
index d85c2ee8..03f26341 100644
--- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
+++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
@@ -23,7 +23,7 @@ package lombok.eclipse.handlers;
 
 import static lombok.core.handlers.HandlerUtil.*;
 import static lombok.eclipse.Eclipse.*;
-import static lombok.eclipse.EclipseAugments.*;
+import static lombok.eclipse.EcjAugments.*;
 import static lombok.eclipse.handlers.EclipseHandlerUtil.EclipseReflectiveMembers.*;
 
 import java.lang.reflect.Array;
@@ -2649,22 +2649,42 @@ public class EclipseHandlerUtil {
 		return null;
 	}
 	
+	private static class EclipseOnlyUtil {
+		public static void setDocComment(CompilationUnitDeclaration cud, TypeDeclaration type, ASTNode node, String doc) {
+			if (cud.compilationResult.compilationUnit instanceof CompilationUnit) {
+				CompilationUnit compilationUnit = (CompilationUnit) cud.compilationResult.compilationUnit;
+				Map<String, String> docs = EclipseAugments.CompilationUnit_javadoc.setIfAbsent(compilationUnit, new HashMap<String, String>());
+				
+				if (node instanceof AbstractMethodDeclaration) {
+					AbstractMethodDeclaration methodDeclaration = (AbstractMethodDeclaration) node;
+					String signature = getSignature(type, methodDeclaration);
+					/* Add javadoc start marker, add leading asterisks to each line, add javadoc end marker */
+					docs.put(signature, String.format("/**%n%s%n */", doc.replaceAll("(?m)^", " * ")));
+				}
+			}
+		}
+	}
+	
+	private static Boolean eclipseMode;
+	private static boolean eclipseMode() {
+		if (eclipseMode != null) return eclipseMode.booleanValue();
+		try {
+			Class.forName("org.eclipse.jdt.internal.core.CompilationUnit");
+			eclipseMode = true;
+		} catch (Exception e) {
+			eclipseMode = false;
+		}
+		return eclipseMode;
+	}
+	
 	public static void setDocComment(CompilationUnitDeclaration cud, EclipseNode eclipseNode, String doc) {
+		if (!eclipseMode()) return;
 		setDocComment(cud, (TypeDeclaration) upToTypeNode(eclipseNode).get(), eclipseNode.get(), doc);
 	}
-	
+	 
 	public static void setDocComment(CompilationUnitDeclaration cud, TypeDeclaration type, ASTNode node, String doc) {
-		if (cud.compilationResult.compilationUnit instanceof CompilationUnit) {
-			CompilationUnit compilationUnit = (CompilationUnit) cud.compilationResult.compilationUnit;
-			Map<String, String> docs = CompilationUnit_javadoc.setIfAbsent(compilationUnit, new HashMap<String, String>());
-			
-			if (node instanceof AbstractMethodDeclaration) {
-				AbstractMethodDeclaration methodDeclaration = (AbstractMethodDeclaration) node;
-				String signature = getSignature(type, methodDeclaration);
-				/* Add javadoc start marker, add leading asterisks to each line, add javadoc end marker */
-				docs.put(signature, String.format("/**%n%s%n */", doc.replaceAll("(?m)^", " * ")));
-			}
-		}
+		if (!eclipseMode()) return;
+		EclipseOnlyUtil.setDocComment(cud, type, node, doc);
 	}
 	
 	public static String getSignature(TypeDeclaration type, AbstractMethodDeclaration methodDeclaration) {