Merge pull request #265 from domaframework/polish-annotation-processing

Polish annotation processing

Author: nakamura-to

src/main/java/org/seasar/doma/internal/apt/AbstractGenerator.java

@@ -1,12 +1,10 @@
 package org.seasar.doma.internal.apt;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.tools.Diagnostic.Kind;
 import org.seasar.doma.DomaException;
-import org.seasar.doma.message.Message;
 import org.seasar.doma.message.MessageResource;
 
 public class AptException extends DomaException {
@@ -21,42 +19,34 @@ public class AptException extends DomaException {
 
   protected AnnotationValue annotationValue;
 
-  public AptException(
-      MessageResource messageResource, ProcessingEnvironment env, Element element, Object[] args) {
-    this(messageResource, env, Kind.ERROR, element, null, null, null, args);
+  public AptException(MessageResource messageResource, Element element, Object[] args) {
+    this(messageResource, Kind.ERROR, element, null, null, null, args);
   }
 
   public AptException(
-      MessageResource messageResource,
-      ProcessingEnvironment env,
-      Element element,
-      Throwable cause,
-      Object[] args) {
-    this(messageResource, env, Kind.ERROR, element, null, null, cause, args);
+      MessageResource messageResource, Element element, Throwable cause, Object[] args) {
+    this(messageResource, Kind.ERROR, element, null, null, cause, args);
   }
 
   public AptException(
       MessageResource messageResource,
-      ProcessingEnvironment env,
       Element element,
       AnnotationMirror annotationMirror,
       Object[] args) {
-    this(messageResource, env, Kind.ERROR, element, annotationMirror, null, null, args);
+    this(messageResource, Kind.ERROR, element, annotationMirror, null, null, args);
   }
 
   public AptException(
       MessageResource messageResource,
-      ProcessingEnvironment env,
       Element element,
       AnnotationMirror annotationMirror,
       AnnotationValue annotationValue,
       Object[] args) {
-    this(messageResource, env, Kind.ERROR, element, annotationMirror, annotationValue, null, args);
+    this(messageResource, Kind.ERROR, element, annotationMirror, annotationValue, null, args);
   }
 
   private AptException(
       MessageResource messageResource,
-      ProcessingEnvironment env,
       Kind kind,
       Element element,
       AnnotationMirror annotationMirror,
@@ -68,9 +58,6 @@ private AptException(
     this.element = element;
     this.annotationMirror = annotationMirror;
     this.annotationValue = annotationValue;
-    if (Options.isDebugEnabled(env)) {
-      Notifier.debug(env, Message.DOMA4074, new Object[] {messageResource, cause});
-    }
   }
 
   public Kind getKind() {

src/main/java/org/seasar/doma/internal/apt/AbstractProcessor.java

@@ -0,0 +1,56 @@
+package org.seasar.doma.internal.apt;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import org.seasar.doma.internal.apt.annot.Annotations;
+import org.seasar.doma.internal.apt.cttype.CtTypes;
+import org.seasar.doma.internal.apt.decl.Declarations;
+import org.seasar.doma.internal.apt.generator.ClassNames;
+
+public class Context {
+
+  private final ProcessingEnvironment env;
+
+  public Context(ProcessingEnvironment env) {
+    this.env = env;
+  }
+
+  public ProcessingEnvironment getEnv() {
+    return env;
+  }
+
+  public Elements getElements() {
+    return new Elements(this);
+  }
+
+  public Types getTypes() {
+    return new Types(this);
+  }
+
+  public Options getOptions() {
+    return new Options(this);
+  }
+
+  public Notifier getNotifier() {
+    return new Notifier(this);
+  }
+
+  public Resources getResources() {
+    return new Resources(this);
+  }
+
+  public Annotations getAnnotations() {
+    return new Annotations(this);
+  }
+
+  public Declarations getDeclarations() {
+    return new Declarations(this);
+  }
+
+  public CtTypes getCtTypes() {
+    return new CtTypes(this);
+  }
+
+  public ClassNames getClassNames() {
+    return new ClassNames(this);
+  }
+}