Clean BaseGeneratedClassHolder

WonderCsabo · Sep 10, 2015 · Jun 7, 2014 · Jun 7, 2014 · Jun 25, 2015 · Jul 1, 2015
commit 8577d80f0213b0c7a72541972c026d92e7f8a659
diff --git a/...ndroidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java b/...ndroidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java
@@ -20,6 +20,7 @@
 import java.util.Set;
 
 import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
 
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
@@ -157,6 +158,10 @@ public JDefinedClass getDefinedClass(String fullyQualifiedName) {
 		return processHolder.definedClass(fullyQualifiedName);
 	}
 
+	public GeneratedClassHolder getGeneratedClassHolder(Element element) {
+		return processHolder.getGeneratedClassHolder(element);
+	}
+
 	public ProcessHolder.Classes getClasses() {
 		return processHolder.classes();
 	}

diff --git a/...ns-core/androidannotations/src/main/java/org/androidannotations/helper/IntentBuilder.java b/...ns-core/androidannotations/src/main/java/org/androidannotations/helper/IntentBuilder.java
@@ -67,7 +67,7 @@ public abstract class IntentBuilder {
 	protected APTCodeModelHelper codeModelHelper;
 
 	public IntentBuilder(HasIntentBuilder holder, AndroidManifest androidManifest) {
-		this.environment = holder.environment();
+		this.environment = holder.getEnvironment();
 		this.holder = holder;
 		this.androidManifest = androidManifest;
 		codeModelHelper = new APTCodeModelHelper(environment);

diff --git a/...roidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java b/...roidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
@@ -62,7 +62,7 @@ protected void setGeneratedClass() throws Exception {
 
 		if (annotatedElement.getNestingKind().isNested()) {
 			Element enclosingElement = annotatedElement.getEnclosingElement();
-			GeneratedClassHolder enclosingHolder = processHolder().getGeneratedClassHolder(enclosingElement);
+			GeneratedClassHolder enclosingHolder = environment.getGeneratedClassHolder(enclosingElement);
 			String generatedBeanSimpleName = annotatedElement.getSimpleName().toString() + classSuffix();
 			generatedClass = enclosingHolder.getGeneratedClass()._class(PUBLIC | FINAL | STATIC, generatedBeanSimpleName, ClassType.CLASS);
 		} else {
@@ -77,7 +77,7 @@ protected void setGeneratedClass() throws Exception {
 		codeModelHelper.copyNonAAAnnotations(generatedClass, annotatedElement.getAnnotationMirrors());
 	}
 
-	public JClass getAnnotatedClass() {
+	protected JClass getAnnotatedClass() {
 		return annotatedClass;
 	}
 
@@ -96,33 +96,25 @@ public TypeElement getAnnotatedElement() {
 		return annotatedElement;
 	}
 
+	@Override
 	public AndroidAnnotationsEnvironment getEnvironment() {
 		return environment;
 	}
 
-	public ProcessHolder processHolder() {
-		return environment.getProcessHolder();
-	}
-
 	protected ProcessHolder.Classes getClasses() {
 		return environment.getClasses();
 	}
 
 	protected JCodeModel getCodeModel() {
-		return environment().getCodeModel();
+		return getEnvironment().getCodeModel();
 	}
 
 	protected JClass getJClass(String fullyQualifiedClassName) {
-		return environment().getJClass(fullyQualifiedClassName);
+		return getEnvironment().getJClass(fullyQualifiedClassName);
 	}
 
 	protected JClass getJClass(Class<?> clazz) {
-		return environment().getJClass(clazz);
-	}
-
-	@Override
-	public AndroidAnnotationsEnvironment environment() {
-		return environment;
+		return getEnvironment().getJClass(clazz);
 	}
 
 	public JClass narrow(JClass toNarrow) {

diff --git a/...ions-core/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java b/...ions-core/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java
@@ -66,6 +66,6 @@ public JBlock getIfNotNullBlock() {
 	}
 
 	protected ProcessHolder.Classes getClasses() {
-		return holder.environment().getClasses();
+		return holder.getEnvironment().getClasses();
 	}
 }
diff --git a/.../androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolder.java b/.../androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolder.java
@@ -27,5 +27,5 @@ public interface GeneratedClassHolder {
 
 	TypeElement getAnnotatedElement();
 
-	AndroidAnnotationsEnvironment environment();
+	AndroidAnnotationsEnvironment getEnvironment();
 }
diff --git a/...annotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java b/...annotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java
@@ -43,23 +43,23 @@ public final TypeElement getAnnotatedElement() {
 	}
 
 	@Override
-	public AndroidAnnotationsEnvironment environment() {
-		return holder.environment();
+	public AndroidAnnotationsEnvironment getEnvironment() {
+		return holder.getEnvironment();
 	}
 
 	protected final Classes getClasses() {
-		return environment().getClasses();
+		return getEnvironment().getClasses();
 	}
 
 	protected final JCodeModel codeModel() {
-		return environment().getCodeModel();
+		return getEnvironment().getCodeModel();
 	}
 
 	protected final JClass refClass(String fullyQualifiedClassName) {
-		return environment().getJClass(fullyQualifiedClassName);
+		return getEnvironment().getJClass(fullyQualifiedClassName);
 	}
 
 	protected final JClass refClass(Class<?> clazz) {
-		return environment().getJClass(clazz);
+		return getEnvironment().getJClass(clazz);
 	}
 }
diff --git a/...e/androidannotations/src/main/java/org/androidannotations/holder/PreferencesDelegate.java b/...e/androidannotations/src/main/java/org/androidannotations/holder/PreferencesDelegate.java
@@ -39,7 +39,7 @@ public class PreferencesDelegate extends GeneratedClassHolderDelegate<EComponent
 
 	public PreferencesDelegate(EComponentWithViewSupportHolder holder) {
 		super(holder);
-		codeModelHelper = new APTCodeModelHelper(holder.environment());
+		codeModelHelper = new APTCodeModelHelper(holder.getEnvironment());
 	}
 
 	@Override

diff --git a/...ore/androidannotations/src/main/java/org/androidannotations/plugin/PluginClassHolder.java b/...ore/androidannotations/src/main/java/org/androidannotations/plugin/PluginClassHolder.java
@@ -45,7 +45,7 @@ public TypeElement getAnnotatedElement() {
 	}
 
 	public AndroidAnnotationsEnvironment environment() {
-		return holder().environment();
+		return holder().getEnvironment();
 	}
 
 	protected JClass getJClass(String fullyQualifiedClassName) {