generalized the annotation processor that lombok.jar represents into a main class that farms out the work to a specific implementation depending on environment; previously lombok.jar's annotation processor was javac specific.

1 files changed, 3 insertions, 31 deletions

diff --git a/src/core/lombok/javac/apt/Processor.java b/src/core/lombok/javac/apt/Processor.java
index b779a680..31cedf03 100644
--- a/src/core/lombok/javac/apt/Processor.java
+++ b/src/core/lombok/javac/apt/Processor.java
@@ -32,7 +32,6 @@ import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
-import javax.tools.Diagnostic.Kind;
 
 import lombok.javac.JavacTransformer;
 
@@ -55,47 +54,20 @@ import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 @SupportedAnnotationTypes("*")
 @SupportedSourceVersion(SourceVersion.RELEASE_6)
 public class Processor extends AbstractProcessor {
-	private ProcessingEnvironment rawProcessingEnv;
 	private JavacProcessingEnvironment processingEnv;
 	private JavacTransformer transformer;
 	private Trees trees;
-	private String errorToShow;
 	
 	/** {@inheritDoc} */
 	@Override public void init(ProcessingEnvironment procEnv) {
 		super.init(procEnv);
-		this.rawProcessingEnv = procEnv;
-		String className = procEnv.getClass().getName();
-		if (className.startsWith("org.eclipse.jdt.")) {
-			errorToShow = "You should not install lombok.jar as an annotation processor in eclipse. Instead, run lombok.jar as a java application and follow the instructions.";
-			procEnv.getMessager().printMessage(Kind.WARNING, errorToShow);
-			this.processingEnv = null;
-		} else if (!procEnv.getClass().getName().equals("com.sun.tools.javac.processing.JavacProcessingEnvironment")) {
-			procEnv.getMessager().printMessage(Kind.WARNING, "You aren't using a compiler based around javac v1.6, so lombok will not work properly.\n" +
-					"Your processor class is: " + className);
-			this.processingEnv = null;
-			this.errorToShow = null;
-		} else {
-			this.processingEnv = (JavacProcessingEnvironment) procEnv;
-			transformer = new JavacTransformer(procEnv.getMessager());
-			trees = Trees.instance(procEnv);
-			this.errorToShow = null;
-		}
+		this.processingEnv = (JavacProcessingEnvironment) procEnv;
+		transformer = new JavacTransformer(procEnv.getMessager());
+		trees = Trees.instance(procEnv);
 	}
 	
 	/** {@inheritDoc} */
 	@Override public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-		if (processingEnv == null) {
-			if (errorToShow != null) {
-				Set<? extends Element> rootElements = roundEnv.getRootElements();
-				if (!rootElements.isEmpty()) {
-					rawProcessingEnv.getMessager().printMessage(Kind.WARNING, errorToShow, rootElements.iterator().next());
-					errorToShow = null;
-				}
-			}
-			return false;
-		}
-		
 		IdentityHashMap<JCCompilationUnit, Void> units = new IdentityHashMap<JCCompilationUnit, Void>();
 		for (Element element : roundEnv.getRootElements()) {
 			JCCompilationUnit unit = toUnit(element);