Skip to content

Commit da65f78

Browse files
yDelouisyDelouis
committed
Remove classes method from GeneratedClassHolder
1 parent a63c663 commit da65f78

67 files changed

Lines changed: 224 additions & 224 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

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

5050
@Override
5151
protected final JClass getListenerTargetClass() {
52-
return classes().PREFERENCE;
52+
return getClasses().PREFERENCE;
5353
}
5454

5555
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected final void assignListeners(EComponentWithViewSupportHolder holder, Lis
5757

5858
@Override
5959
protected JClass getListenerTargetClass() {
60-
return classes().VIEW;
60+
return getClasses().VIEW;
6161
}
6262

6363
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ public AnimationResHandler(AndroidAnnotationsEnvironment environmentEnvironment)
3232

3333
@Override
3434
protected void makeCall(String fieldName, EComponentHolder holder, JBlock methodBody, JFieldRef idRef) {
35-
methodBody.assign(ref(fieldName), classes().ANIMATION_UTILS.staticInvoke("loadAnimation").arg(holder.getContextRef()).arg(idRef));
35+
methodBody.assign(ref(fieldName), getClasses().ANIMATION_UTILS.staticInvoke("loadAnimation").arg(holder.getContextRef()).arg(idRef));
3636
}
3737
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ public void process(Element element, EComponentHolder holder) throws Exception {
5959
// Catch exception in user code
6060
JTryBlock tryBlock = executeMethod.body()._try();
6161
tryBlock.body().add(previousMethodBody);
62-
JCatchBlock catchBlock = tryBlock._catch(holder.classes().THROWABLE);
62+
JCatchBlock catchBlock = tryBlock._catch(getClasses().THROWABLE);
6363
JVar caughtException = catchBlock.param("e");
64-
JStatement uncaughtExceptionCall = holder.classes().THREAD //
64+
JStatement uncaughtExceptionCall = getClasses().THREAD //
6565
.staticInvoke("getDefaultUncaughtExceptionHandler") //
6666
.invoke("uncaughtException") //
67-
.arg(holder.classes().THREAD.staticInvoke("currentThread")) //
67+
.arg(getClasses().THREAD.staticInvoke("currentThread")) //
6868
.arg(caughtException);
6969
catchBlock.body().add(uncaughtExceptionCall);
7070

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public ProcessHolder processHolder() {
5959
return environment.getProcessHolder();
6060
}
6161

62-
public ProcessHolder.Classes classes() {
63-
return processHolder().classes();
62+
protected ProcessHolder.Classes getClasses() {
63+
return environment.getClasses();
6464
}
6565

6666
public JCodeModel codeModel() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
6363

6464
@Override
6565
protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> parameters) {
66-
JVar btnParam = listenerMethod.param(classes().COMPOUND_BUTTON, "buttonView");
66+
JVar btnParam = listenerMethod.param(getClasses().COMPOUND_BUTTON, "buttonView");
6767
JVar isCheckedParam = listenerMethod.param(codeModel().BOOLEAN, "isChecked");
6868

6969
for (VariableElement parameter : parameters) {
@@ -88,11 +88,11 @@ protected String getSetterName() {
8888

8989
@Override
9090
protected JClass getListenerClass() {
91-
return classes().COMPOUND_BUTTON_ON_CHECKED_CHANGE_LISTENER;
91+
return getClasses().COMPOUND_BUTTON_ON_CHECKED_CHANGE_LISTENER;
9292
}
9393

9494
@Override
9595
protected JClass getListenerTargetClass() {
96-
return classes().COMPOUND_BUTTON;
96+
return getClasses().COMPOUND_BUTTON;
9797
}
9898
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
6262
protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> parameters) {
6363
boolean hasItemParameter = parameters.size() == 1;
6464

65-
JVar viewParam = listenerMethod.param(classes().VIEW, "view");
65+
JVar viewParam = listenerMethod.param(getClasses().VIEW, "view");
6666

6767
if (hasItemParameter) {
6868
call.arg(castArgumentIfNecessary(holder, CanonicalNameConstants.VIEW, viewParam, parameters.get(0)));
@@ -81,7 +81,7 @@ protected String getSetterName() {
8181

8282
@Override
8383
protected JClass getListenerClass() {
84-
return classes().VIEW_ON_CLICK_LISTENER;
84+
return getClasses().VIEW_ON_CLICK_LISTENER;
8585
}
8686

8787
}

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

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

4747
JFieldRef contentViewId = annotationHelper.extractAnnotationFieldRefs(element, getTarget(), getEnvironment().getRClass().get(IRClass.Res.LAYOUT), false).get(0);
4848

49-
JFieldRef customTitleFeature = classes().WINDOW.staticRef("FEATURE_CUSTOM_TITLE");
49+
JFieldRef customTitleFeature = getClasses().WINDOW.staticRef("FEATURE_CUSTOM_TITLE");
5050
holder.getInitBody().invoke("requestWindowFeature").arg(customTitleFeature);
5151
onViewChangedBody.add(holder.getContextRef().invoke("getWindow").invoke("setFeatureInt").arg(customTitleFeature).arg(contentViewId));
5252
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public DrawableResHandler(AndroidAnnotationsEnvironment environment) {
4747
protected void makeCall(String fieldName, EComponentHolder holder, JBlock methodBody, JFieldRef idRef) {
4848
JFieldRef ref = ref(fieldName);
4949
if (hasContextCompatInClasspath()) {
50-
methodBody.assign(ref, classes().CONTEXT_COMPAT.staticInvoke("getDrawable").arg(holder.getContextRef()).arg(idRef));
50+
methodBody.assign(ref, getClasses().CONTEXT_COMPAT.staticInvoke("getDrawable").arg(holder.getContextRef()).arg(idRef));
5151
} else if (shouldUseContextGetDrawableMethod() && !hasContextCompatInClasspath()) {
5252
methodBody.assign(ref, holder.getContextRef().invoke("getDrawable").arg(idRef));
5353
} else if (!shouldUseContextGetDrawableMethod() && hasGetDrawableInContext() && !hasContextCompatInClasspath()) {
@@ -73,7 +73,7 @@ private boolean hasGetDrawableInContext() {
7373

7474
private void createCallWithIfGuard(EComponentHolder holder, JFieldRef ref, JBlock methodBody, JFieldRef idRef) {
7575
JVar resourcesRef = holder.getResourcesRef();
76-
JConditional guardIf = methodBody._if(holder.classes().BUILD_VERSION.staticRef("SDK_INT").gte(holder.classes().BUILD_VERSION_CODES.staticRef("LOLLIPOP")));
76+
JConditional guardIf = methodBody._if(getClasses().BUILD_VERSION.staticRef("SDK_INT").gte(getClasses().BUILD_VERSION_CODES.staticRef("LOLLIPOP")));
7777
JBlock ifBlock = guardIf._then();
7878
ifBlock.assign(ref, holder.getContextRef().invoke("getDrawable").arg(idRef));
7979

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ protected void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror
7373

7474
@Override
7575
protected void processParameters(EComponentWithViewSupportHolder holder, JMethod listenerMethod, JInvocation call, List<? extends VariableElement> userParameters) {
76-
JVar textView = listenerMethod.param(classes().TEXT_VIEW, "textView");
76+
JVar textView = listenerMethod.param(getClasses().TEXT_VIEW, "textView");
7777
JVar actionId = listenerMethod.param(codeModel().INT, "actionId");
78-
JVar event = listenerMethod.param(classes().KEY_EVENT, "event");
78+
JVar event = listenerMethod.param(getClasses().KEY_EVENT, "event");
7979

8080
for (VariableElement param : userParameters) {
8181
String paramClassQualifiedName = param.asType().toString();
@@ -101,11 +101,11 @@ protected String getSetterName() {
101101

102102
@Override
103103
protected JClass getListenerClass() {
104-
return classes().TEXT_VIEW_ON_EDITOR_ACTION_LISTENER;
104+
return getClasses().TEXT_VIEW_ON_EDITOR_ACTION_LISTENER;
105105
}
106106

107107
@Override
108108
protected JClass getListenerTargetClass() {
109-
return classes().TEXT_VIEW;
109+
return getClasses().TEXT_VIEW;
110110
}
111111
}

0 commit comments

Comments
 (0)