Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Commit df4cfb7

Browse files
yDelouisyDelouis
committed
Rename processingEnvironment method in BaseAnnotationHandler
1 parent 8577d80 commit df4cfb7

7 files changed

Lines changed: 27 additions & 25 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,25 @@ public BaseAnnotationHandler(String target, AndroidAnnotationsEnvironment enviro
5151
codeModelHelper = new APTCodeModelHelper(environment);
5252
}
5353

54-
public ProcessingEnvironment processingEnvironment() {
54+
@Override
55+
public String getTarget() {
56+
return target;
57+
}
58+
59+
@Override
60+
public ElementValidation validate(Element element) {
61+
ElementValidation validation = new ElementValidation(target, element);
62+
validate(element, validation);
63+
return validation;
64+
}
65+
66+
protected abstract void validate(Element element, ElementValidation validation);
67+
68+
protected AndroidAnnotationsEnvironment getEnvironment() {
69+
return environment;
70+
}
71+
72+
protected ProcessingEnvironment getProcessingEnvironment() {
5573
return environment.getProcessingEnvironment();
5674
}
5775

@@ -79,21 +97,5 @@ public JClass refClass(Class<?> clazz) {
7997
return processHolder().refClass(clazz);
8098
}
8199

82-
@Override
83-
public String getTarget() {
84-
return target;
85-
}
86-
87-
public AndroidAnnotationsEnvironment getEnvironment() {
88-
return environment;
89-
}
90-
91-
@Override
92-
public ElementValidation validate(Element element) {
93-
ElementValidation validation = new ElementValidation(target, element);
94-
validate(element, validation);
95-
return validation;
96-
}
97100

98-
protected abstract void validate(Element element, ElementValidation validation);
99101
}

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/BeanHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void process(Element element, EComponentHolder holder) throws Exception {
5454
TypeMirror typeMirror = annotationHelper.extractAnnotationClassParameter(element);
5555
if (typeMirror == null) {
5656
typeMirror = element.asType();
57-
typeMirror = processingEnvironment().getTypeUtils().erasure(typeMirror);
57+
typeMirror = getProcessingEnvironment().getTypeUtils().erasure(typeMirror);
5858
}
5959

6060
String typeQualifiedName = typeMirror.toString();

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/DrawableResHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ protected void makeCall(String fieldName, EComponentHolder holder, JBlock method
5858
}
5959

6060
private boolean hasContextCompatInClasspath() {
61-
return processingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.CONTEXT_COMPAT) != null;
61+
return getProcessingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.CONTEXT_COMPAT) != null;
6262
}
6363

6464
private boolean shouldUseContextGetDrawableMethod() {
6565
return getEnvironment().getAndroidManifest().getMinSdkVersion() >= MIN_SDK_WITH_CONTEXT_GET_DRAWABLE;
6666
}
6767

6868
private boolean hasGetDrawableInContext() {
69-
TypeElement context = processingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.CONTEXT);
69+
TypeElement context = getProcessingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.CONTEXT);
7070

7171
return hasGetDrawable(context);
7272
}
@@ -86,7 +86,7 @@ private boolean hasGetDrawable(TypeElement type) {
8686
return false;
8787
}
8888

89-
List<? extends Element> allMembers = processingEnvironment().getElementUtils().getAllMembers(type);
89+
List<? extends Element> allMembers = getProcessingEnvironment().getElementUtils().getAllMembers(type);
9090
for (ExecutableElement element : ElementFilter.methodsIn(allMembers)) {
9191
if (element.getSimpleName().contentEquals("getDrawable")) {
9292
return true;

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/SharedPrefHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void validate(Element element, ElementValidation validation) {
114114

115115
validatorHelper.isInterface(typeElement, validation);
116116

117-
List<? extends Element> inheritedMembers = processingEnvironment().getElementUtils().getAllMembers(typeElement);
117+
List<? extends Element> inheritedMembers = getProcessingEnvironment().getElementUtils().getAllMembers(typeElement);
118118

119119
for (Element memberElement : inheritedMembers) {
120120
if (!memberElement.getEnclosingElement().asType().toString().equals("java.lang.Object")) {

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/SystemServiceHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private JStatement createNormalInjection(EComponentHolder holder, String fieldNa
9696
}
9797

9898
private boolean isApiOnClasspath(String apiName) {
99-
TypeElement typeElement = processingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.BUILD_VERSION_CODES);
99+
TypeElement typeElement = getProcessingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.BUILD_VERSION_CODES);
100100
for (Element element : typeElement.getEnclosedElements()) {
101101
if (element.getSimpleName().contentEquals(apiName)) {
102102
return true;

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/ViewsByIdHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void process(Element element, EComponentWithViewSupportHolder holder) {
7575

7676
private void instantiateArrayList(JFieldRef elementRef, TypeMirror viewType, EComponentWithViewSupportHolder holder) {
7777
TypeElement arrayListTypeElement = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.ARRAYLIST);
78-
DeclaredType arrayListType = processingEnvironment().getTypeUtils().getDeclaredType(arrayListTypeElement, viewType);
78+
DeclaredType arrayListType = getProcessingEnvironment().getTypeUtils().getDeclaredType(arrayListTypeElement, viewType);
7979
JClass arrayListClass = codeModelHelper.typeMirrorToJClass(arrayListType);
8080

8181
holder.getInitBody().assign(elementRef, _new(arrayListClass));

‎AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestServiceHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void process(Element element, EComponentHolder holder) {
5252
String fieldName = element.getSimpleName().toString();
5353

5454
TypeMirror fieldTypeMirror = element.asType();
55-
TypeMirror erasedFieldTypeMirror = processingEnvironment().getTypeUtils().erasure(fieldTypeMirror);
55+
TypeMirror erasedFieldTypeMirror = getProcessingEnvironment().getTypeUtils().erasure(fieldTypeMirror);
5656
String interfaceName = erasedFieldTypeMirror.toString();
5757

5858
String generatedClassName = interfaceName + classSuffix();

0 commit comments

Comments
 (0)