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

Commit

Permalink
Merge pull request #2262 from WonderCsabo/revert-jcodemodel-update
Browse files Browse the repository at this point in the history 
Revert "Update JCodeModel to 3.2.1"
  • Loading branch information
@WonderCsabo
WonderCsabo committed Mar 30, 2020
2 parents 1579bd4 + 2a10b83 commit 12d1ed9
Show file tree
Hide file tree
Showing 52 changed files with 126 additions and 159 deletions.
14 changes: 3 additions & 11 deletions ...re/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
import com.helger.jcodemodel.AbstractJType;
import com.helger.jcodemodel.IJAnnotatable;
import com.helger.jcodemodel.IJExpression;
import com.helger.jcodemodel.IJFormatter;
import com.helger.jcodemodel.IJGenerifiable;
import com.helger.jcodemodel.IJStatement;
import com.helger.jcodemodel.JAnnotationArrayMember;
Expand All @@ -70,14 +69,12 @@
import com.helger.jcodemodel.JCodeModel;
import com.helger.jcodemodel.JDefinedClass;
import com.helger.jcodemodel.JExpr;
import com.helger.jcodemodel.JFormatter;
import com.helger.jcodemodel.JInvocation;
import com.helger.jcodemodel.JMethod;
import com.helger.jcodemodel.JMod;
import com.helger.jcodemodel.JTypeVar;
import com.helger.jcodemodel.JVar;
import com.helger.jcodemodel.SourcePrintWriter;
import com.helger.jcodemodel.writer.JCMWriter;
import com.helger.jcodemodel.writer.JFormatter;

public class APTCodeModelHelper {

Expand Down Expand Up @@ -428,7 +425,7 @@ public void replaceSuperCall(JMethod method, JBlock replacement) {

for (Object content : oldBody.getContents()) {
StringWriter writer = new StringWriter();
IJFormatter formatter = createFormatter(writer);
JFormatter formatter = new JFormatter(writer);
IJStatement statement = (IJStatement) content;
statement.state(formatter);
String statementString = writer.getBuffer().toString();
Expand All @@ -440,11 +437,6 @@ public void replaceSuperCall(JMethod method, JBlock replacement) {
}
}

private static IJFormatter createFormatter(StringWriter writer) {
SourcePrintWriter sourcePrintWriter = new SourcePrintWriter(writer, JCMWriter.getDefaultNewLine());
return new JFormatter(sourcePrintWriter, JCMWriter.DEFAULT_INDENT_STRING);
}

public JDefinedClass createDelegatingAnonymousRunnableClass(JBlock previousBody) {
JCodeModel codeModel = environment.getCodeModel();

Expand Down Expand Up @@ -598,7 +590,7 @@ public void addSuppressWarnings(IJAnnotatable generatedElement, String annotatio
if (SuppressWarnings.class.getCanonicalName().equals(annotationUse.getAnnotationClass().fullName())) {
AbstractJAnnotationValue value = annotationUse.getParam("value");
StringWriter code = new StringWriter();
IJFormatter formatter = createFormatter(code);
JFormatter formatter = new JFormatter(code);
formatter.generable(value);
if (!code.toString().contains(annotationValue)) {
if (value instanceof JAnnotationArrayMember) {
Expand Down
13 changes: 6 additions & 7 deletions ...-core/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ private void setOnCreate() {
JVar onCreateSavedInstanceState = onCreate.param(bundleClass, "savedInstanceState");
JBlock onCreateBody = onCreate.body();
JVar previousNotifier = viewNotifierHelper.replacePreviousNotifier(onCreateBody);
onCreateBody.add(JExpr.invoke(getInit()).arg(onCreateSavedInstanceState));
onCreateBody.add(_super().invoke(onCreate).arg(onCreateSavedInstanceState));
onCreateBody.invoke(getInit()).arg(onCreateSavedInstanceState);
onCreateBody.invoke(_super(), onCreate).arg(onCreateSavedInstanceState);
viewNotifierHelper.resetPreviousNotifier(onCreateBody, previousNotifier);
}

Expand Down Expand Up @@ -205,7 +205,7 @@ private void setOnNewIntent() {
onNewIntentMethod.annotate(Override.class);
JVar intent = onNewIntentMethod.param(getClasses().INTENT, "intent");
JBlock body = onNewIntentMethod.body();
body.add(_super().invoke(onNewIntentMethod).arg(intent));
body.invoke(_super(), onNewIntentMethod).arg(intent);
onNewIntentAfterSuperBlock = body.blockSimple();
}

Expand All @@ -214,7 +214,7 @@ private void setSetIntent() {
setIntent.annotate(Override.class);
JVar methodParam = setIntent.param(getClasses().INTENT, "newIntent");
JBlock setIntentBody = setIntent.body();
setIntentBody.add(_super().invoke(setIntent).arg(methodParam));
setIntentBody.invoke(_super(), setIntent).arg(methodParam);
}

public JMethod getOnStop() {
Expand Down Expand Up @@ -276,7 +276,7 @@ private void setOnConfigurationChanged() {
onConfigurationChangedNewConfigParam = method.param(configurationClass, "newConfig");
JBlock body = method.body();
onConfigurationChangedBeforeSuperBlock = body.blockSimple();
body.add(_super().invoke(method).arg(onConfigurationChangedNewConfigParam));
body.invoke(_super(), method).arg(onConfigurationChangedNewConfigParam);
onConfigurationChangedAfterSuperBlock = body.blockSimple();
}

Expand Down Expand Up @@ -397,8 +397,7 @@ private JMethod setContentViewMethod(AbstractJType[] paramTypes, String[] paramN
params.add(param);
}
JBlock body = method.body();
JInvocation superCall = _super().invoke(method);
body.add(superCall);
JInvocation superCall = body.invoke(JExpr._super(), method);
for (JVar arg : params) {
superCall.arg(arg);
}
Expand Down
5 changes: 2 additions & 3 deletions ...ions-core/androidannotations/src/main/java/org/androidannotations/holder/EBeanHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import com.helger.jcodemodel.AbstractJClass;
import com.helger.jcodemodel.IJExpression;
import com.helger.jcodemodel.JBlock;
import com.helger.jcodemodel.JExpr;
import com.helger.jcodemodel.JFieldVar;
import com.helger.jcodemodel.JInvocation;
import com.helger.jcodemodel.JMethod;
Expand Down Expand Up @@ -65,7 +64,7 @@ private void setConstructors() {
List<ExecutableElement> constructors = ElementFilter.constructorsIn(annotatedElement.getEnclosedElements());
ExecutableElement superConstructor = constructors.get(0);
if (superConstructor.getParameters().size() == 1) {
constructorBody.add(JExpr.invokeSuper().arg(constructorContextParam));
constructorBody.invoke("super").arg(constructorContextParam);
}
constructorBody.assign(getContextField(), constructorContextParam);

Expand All @@ -74,7 +73,7 @@ private void setConstructors() {
JVar overloadedConstructorRootFragmentParam = overloadedConstructor.param(getClasses().OBJECT, "rootFragment");
JBlock overloadedConstructorBody = overloadedConstructor.body();
if (superConstructor.getParameters().size() == 1) {
overloadedConstructorBody.add(JExpr.invokeSuper().arg(constructorContextParam));
overloadedConstructorBody.invokeSuper().arg(constructorContextParam);
}
overloadedConstructorBody.assign(getContextField(), overloadedConstructorContextParam);
overloadedConstructorBody.assign(getRootFragmentField(), overloadedConstructorRootFragmentParam);
Expand Down
10 changes: 5 additions & 5 deletions ...otations/src/main/java/org/androidannotations/holder/EComponentWithViewSupportHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ protected void setOnViewChanged() {
onViewChangedBodyAfterInjectionBlock = onViewChangedBody.blockVirtual();
onViewChangedHasViewsParam = onViewChanged.param(HasViews.class, "hasViews");
AbstractJClass notifierClass = getJClass(OnViewChangedNotifier.class);
getInitBodyInjectionBlock().add(notifierClass.staticInvoke("registerOnViewChangedListener").arg(_this()));
getInitBodyInjectionBlock().staticInvoke(notifierClass, "registerOnViewChangedListener").arg(_this());
}

protected void implementBeanHolder() {
Expand Down Expand Up @@ -325,7 +325,7 @@ private TextWatcherHolder createTextWatcherHolder(JFieldRef idRef, TypeMirror vi
JBlock onViewChangedBody = getOnViewChangedBodyInjectionBlock().blockSimple();
JVar viewVariable = onViewChangedBody.decl(FINAL, viewClass, "view", cast(viewClass, findViewById(idRef)));
onViewChangedBody._if(viewVariable.ne(JExpr._null()))._then() //
.add(viewVariable.invoke("addTextChangedListener").arg(_new(onTextChangeListenerClass)));
.invoke(viewVariable, "addTextChangedListener").arg(_new(onTextChangeListenerClass));

return new TextWatcherHolder(this, viewVariable, onTextChangeListenerClass);
}
Expand All @@ -345,7 +345,7 @@ private OnSeekBarChangeListenerHolder createOnSeekBarChangeListenerHolder(JField
AbstractJClass viewClass = getClasses().SEEKBAR;

FoundViewHolder foundViewHolder = getFoundViewHolder(idRef, viewClass);
foundViewHolder.getIfNotNullBlock().add(JExpr.invoke(foundViewHolder.getRef(), "setOnSeekBarChangeListener").arg(_new(onSeekbarChangeListenerClass)));
foundViewHolder.getIfNotNullBlock().invoke(foundViewHolder.getRef(), "setOnSeekBarChangeListener").arg(_new(onSeekbarChangeListenerClass));

return new OnSeekBarChangeListenerHolder(this, onSeekbarChangeListenerClass);
}
Expand Down Expand Up @@ -377,9 +377,9 @@ private PageChangeHolder createPageChangeHolder(JFieldRef idRef, TypeMirror view
JVar viewVariable = onViewChangedBody.decl(FINAL, viewClass, "view", cast(viewClass, findViewById(idRef)));
JBlock block = onViewChangedBody._if(viewVariable.ne(JExpr._null()))._then();
if (hasAddOnPageChangeListenerMethod) {
block.add(JExpr.invoke(viewVariable, "addOnPageChangeListener").arg(_new(onPageChangeListenerClass)));
block.invoke(viewVariable, "addOnPageChangeListener").arg(_new(onPageChangeListenerClass));
} else {
block.add(JExpr.invoke(viewVariable, "setOnPageChangeListener").arg(_new(onPageChangeListenerClass)));
block.invoke(viewVariable, "setOnPageChangeListener").arg(_new(onPageChangeListenerClass));
}
return new PageChangeHolder(this, viewVariable, onPageChangeListenerClass);
}
Expand Down
14 changes: 7 additions & 7 deletions ...-core/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ private void setOnCreate() {
JBlock onCreateBody = onCreate.body();

JVar previousNotifier = viewNotifierHelper.replacePreviousNotifier(onCreateBody);
onCreateBody.add(JExpr.invoke(getInit()).arg(onCreateSavedInstanceState));
onCreateBody.add(_super().invoke(onCreate).arg(onCreateSavedInstanceState));
onCreateBody.invoke(getInit()).arg(onCreateSavedInstanceState);
onCreateBody.invoke(_super(), onCreate).arg(onCreateSavedInstanceState);
onCreateAfterSuperBlock = onCreateBody.blockSimple();
viewNotifierHelper.resetPreviousNotifier(onCreateBody, previousNotifier);
}
Expand All @@ -118,7 +118,7 @@ private void setOnViewCreated() {
JVar view = onViewCreated.param(getClasses().VIEW, "view");
JVar savedInstanceState = onViewCreated.param(getClasses().BUNDLE, "savedInstanceState");
JBlock onViewCreatedBody = onViewCreated.body();
onViewCreatedBody.add(_super().invoke(onViewCreated).arg(view).arg(savedInstanceState));
onViewCreatedBody.invoke(_super(), onViewCreated).arg(view).arg(savedInstanceState);
viewNotifierHelper.invokeViewChanged(onViewCreatedBody);
}

Expand Down Expand Up @@ -150,7 +150,7 @@ private void setFragmentBuilderBuild() {

AbstractJClass result = narrow(generatedClass);
JVar fragment = body.decl(result, "fragment_", _new(result));
body.add(fragment.invoke("setArguments").arg(fragmentArgumentsBuilderField));
body.invoke(fragment, "setArguments").arg(fragmentArgumentsBuilderField);
body._return(fragment);
}

Expand All @@ -168,9 +168,9 @@ private void setOnCreateOptionsMenu() {
onCreateOptionsMenuMenuInflaterVar = method.param(getClasses().MENU_INFLATER, "inflater");
onCreateOptionsMenuMethodInflateBody = methodBody.blockSimple();
onCreateOptionsMenuMethodBody = methodBody.blockSimple();
methodBody.add(_super().invoke(method).arg(onCreateOptionsMenuMenuParam).arg(onCreateOptionsMenuMenuInflaterVar));
methodBody.invoke(_super(), method).arg(onCreateOptionsMenuMenuParam).arg(onCreateOptionsMenuMenuInflaterVar);

getInitBody().add(JExpr.invoke("setHasOptionsMenu").arg(JExpr.TRUE));
getInitBody().invoke("setHasOptionsMenu").arg(JExpr.TRUE);
}

private void setOnOptionsItemSelected() {
Expand Down Expand Up @@ -286,7 +286,7 @@ private void setOnAttach() {
onAttach.annotate(Override.class);
JVar activityParam = onAttach.param(getClasses().ACTIVITY, "activity");
JBlock onAttachBody = onAttach.body();
onAttachBody.add(_super().invoke(onAttach).arg(activityParam));
onAttachBody.invoke(_super(), onAttach).arg(activityParam);
onAttachAfterSuperBlock = onAttachBody.blockSimple();
}

Expand Down
4 changes: 2 additions & 2 deletions ...-core/androidannotations/src/main/java/org/androidannotations/holder/EReceiverHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ private void createOnReceive() {
onReceiveIntent = onReceiveMethod.param(getClasses().INTENT, "intent");
onReceiveMethod.annotate(Override.class);
onReceiveBody = onReceiveMethod.body();
onReceiveBody.add(JExpr.invoke(getInit()).arg(onReceiveContext));
onReceiveBody.add(JExpr._super().invoke(onReceiveMethod).arg(onReceiveContext).arg(onReceiveIntent));
onReceiveBody.invoke(getInit()).arg(onReceiveContext);
onReceiveBody.invoke(JExpr._super(), onReceiveMethod).arg(onReceiveContext).arg(onReceiveIntent);
}

private void setOnReceiveIntentAction() {
Expand Down
3 changes: 1 addition & 2 deletions ...ions-core/androidannotations/src/main/java/org/androidannotations/holder/EViewHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ private void createConstructorAndBuilder() {
codeModelHelper.generify(staticHelper, getAnnotatedElement());

JBlock body = copyConstructor.body();
JInvocation superCall = JExpr.invokeSuper();
body.add(superCall);
JInvocation superCall = body.invoke("super");
AbstractJClass narrowedGeneratedClass = narrow(generatedClass);

JInvocation newInvocation = JExpr._new(narrowedGeneratedClass);
Expand Down
4 changes: 2 additions & 2 deletions ...androidannotations/src/main/java/org/androidannotations/holder/InstanceStateDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private void setSaveStateMethod() {

saveStateMethodBody = method.body();

saveStateMethodBody.add(JExpr._super().invoke("onSaveInstanceState").arg(saveStateBundleParam));
saveStateMethodBody.invoke(JExpr._super(), "onSaveInstanceState").arg(saveStateBundleParam);
}

@Override
Expand Down Expand Up @@ -92,7 +92,7 @@ public JVar getRestoreStateBundleParam() {
private void setRestoreStateMethod() {
restoreStateMethod = getGeneratedClass().method(PRIVATE, codeModel().VOID, "restoreSavedInstanceState" + generationSuffix());
restoreStateBundleParam = restoreStateMethod.param(getClasses().BUNDLE, "savedInstanceState");
holder.getInitBodyInjectionBlock().add(JExpr.invoke(restoreStateMethod).arg(restoreStateBundleParam));
holder.getInitBodyInjectionBlock().invoke(restoreStateMethod).arg(restoreStateBundleParam);

restoreStateMethodBody = restoreStateMethod.body();
restoreStateMethodBody //
Expand Down
2 changes: 1 addition & 1 deletion ...roidannotations/src/main/java/org/androidannotations/holder/OnActivityResultDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private void setOnActivityResult() {
resultCodeParam = method.param(codeModel().INT, "resultCode");
dataParam = method.param(getClasses().INTENT, "data");
JBlock body = method.body();
body.add(_super().invoke(method).arg(requestCodeParam).arg(resultCodeParam).arg(dataParam));
body.invoke(_super(), method).arg(requestCodeParam).arg(resultCodeParam).arg(dataParam);
afterSuperBlock = body.blockSimple();
}
}
2 changes: 1 addition & 1 deletion ...e/androidannotations/src/main/java/org/androidannotations/holder/PreferencesDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private void setAddPreferencesFromResourceBlock() {
JMethod method = getGeneratedClass().method(PUBLIC, codeModel().VOID, "addPreferencesFromResource");
method.annotate(Override.class);
JVar preferencesResIdParam = method.param(int.class, "preferencesResId");
method.body().add(JExpr._super().invoke("addPreferencesFromResource").arg(preferencesResIdParam));
method.body().invoke(JExpr._super(), "addPreferencesFromResource").arg(preferencesResIdParam);
addPreferencesFromResourceInjectionBlock = method.body().blockVirtual();
addPreferencesFromResourceAfterInjectionBlock = method.body().blockVirtual();
}
Expand Down
4 changes: 2 additions & 2 deletions ...annotations/src/main/java/org/androidannotations/holder/ReceiverRegistrationDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ private JFieldVar createIntentFilterField(IntentFilterData intentFilterData) {

JBlock intentFilterTarget = holder.getIntentFilterInitializationBlock(intentFilterData);
for (String action : intentFilterData.getActionSet()) {
intentFilterTarget.add(intentFilterField.invoke("addAction").arg(action));
intentFilterTarget.invoke(intentFilterField, "addAction").arg(action);
}
for (String dataScheme : intentFilterData.getDataSchemeSet()) {
intentFilterTarget.add(intentFilterField.invoke("addDataScheme").arg(dataScheme));
intentFilterTarget.invoke(intentFilterField, "addDataScheme").arg(dataScheme);
}

return intentFilterField;
Expand Down
2 changes: 1 addition & 1 deletion ...core/androidannotations/src/main/java/org/androidannotations/holder/SharedPrefHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private void createEditorConstructor() {
editorConstructor = editorClass.constructor(JMod.NONE);
AbstractJClass sharedPreferencesClass = getJClass("android.content.SharedPreferences");
JVar sharedPreferencesParam = editorConstructor.param(sharedPreferencesClass, "sharedPreferences");
editorConstructor.body().add(JExpr.invokeSuper().arg(sharedPreferencesParam));
editorConstructor.body().invoke("super").arg(sharedPreferencesParam);
}

private void createEditMethod() {
Expand Down
7 changes: 3 additions & 4 deletions ...oidannotations/src/main/java/org/androidannotations/holder/ViewInstanceStateDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import static org.androidannotations.helper.ModelConstants.generationSuffix;

import com.helger.jcodemodel.JBlock;
import com.helger.jcodemodel.JExpr;
import com.helger.jcodemodel.JMethod;
import com.helger.jcodemodel.JVar;

Expand Down Expand Up @@ -71,9 +70,9 @@ private void setSaveStateMethod() {
JVar onSaveSuperInstanceState = methodBody.decl(getClasses().PARCELABLE, "instanceState", _super().invoke("onSaveInstanceState"));

JVar bundleParam = methodBody.decl(getClasses().BUNDLE, "bundle" + generationSuffix(), _new(getClasses().BUNDLE));
methodBody.add(bundleParam.invoke("putParcelable").arg(getInstanceStateKey()).arg(onSaveSuperInstanceState));
methodBody.invoke(bundleParam, "putParcelable").arg(getInstanceStateKey()).arg(onSaveSuperInstanceState);

methodBody.add(JExpr.invoke(saveStateMethod).arg(bundleParam));
methodBody.invoke(saveStateMethod).arg(bundleParam);

methodBody._return(bundleParam);
}
Expand Down Expand Up @@ -113,7 +112,7 @@ private void setRestoreStateMethod() {

restoreStateMethodBody = body.blockSimple();

body.add(_super().invoke("onRestoreInstanceState").arg(instanceState));
body.invoke(_super(), "onRestoreInstanceState").arg(instanceState);
}

private JVar getInstanceStateKey() {
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/androidannotations/internal/core/handler/AbstractPreferenceListenerHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected final Res getResourceType() {
protected final void assignListeners(HasPreferences holder, List<JFieldRef> idsRefs, JDefinedClass listenerAnonymousClass) {
for (JFieldRef idRef : idsRefs) {
FoundPreferenceHolder foundPreferenceHolder = holder.getFoundPreferenceHolder(idRef, getListenerTargetClass(holder));
foundPreferenceHolder.getIfNotNullBlock().add(foundPreferenceHolder.getRef().invoke(getSetterName()).arg(_new(listenerAnonymousClass)));
foundPreferenceHolder.getIfNotNullBlock().invoke(foundPreferenceHolder.getRef(), getSetterName()).arg(_new(listenerAnonymousClass));
}
}
}
3 changes: 1 addition & 2 deletions ...c/main/java/org/androidannotations/internal/core/handler/AbstractSeekBarTouchHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ public void process(Element element, EComponentWithViewSupportHolder holder) thr
JBlock methodBody = getMethodBodyToCall(onSeekBarChangeListenerHolder);

IJExpression activityRef = holder.getGeneratedClass().staticRef("this");
JInvocation textChangeCall = activityRef.invoke(methodName);
methodBody.add(textChangeCall);
JInvocation textChangeCall = methodBody.invoke(activityRef, methodName);

ExecutableElement executableElement = (ExecutableElement) element;
List<? extends VariableElement> parameters = executableElement.getParameters();
Expand Down
4 changes: 1 addition & 3 deletions ...c/main/java/org/androidannotations/internal/core/handler/AbstractViewListenerHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.helger.jcodemodel.AbstractJClass;
import com.helger.jcodemodel.JDefinedClass;
import com.helger.jcodemodel.JFieldRef;
import com.helger.jcodemodel.JInvocation;

public abstract class AbstractViewListenerHandler extends AbstractListenerHandler<EComponentWithViewSupportHolder> {

Expand All @@ -54,8 +53,7 @@ protected final void assignListeners(EComponentWithViewSupportHolder holder, Lis
for (JFieldRef idRef : idsRefs) {
AbstractJClass listenerTargetClass = getListenerTargetClass(holder);
FoundViewHolder foundViewHolder = holder.getFoundViewHolder(idRef, listenerTargetClass);
JInvocation invocation = foundViewHolder.getOrCastRef(listenerTargetClass).invoke(getSetterName()).arg(_new(listenerAnonymousClass));
foundViewHolder.getIfNotNullBlock().add(invocation);
foundViewHolder.getIfNotNullBlock().invoke(foundViewHolder.getOrCastRef(listenerTargetClass), getSetterName()).arg(_new(listenerAnonymousClass));
}
}

Expand Down
3 changes: 1 addition & 2 deletions ...ns/src/main/java/org/androidannotations/internal/core/handler/AfterTextChangeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ public void process(Element element, EComponentWithViewSupportHolder holder) thr
JBlock methodBody = textWatcherHolder.getAfterTextChangedBody();

IJExpression activityRef = holder.getGeneratedClass().staticRef("this");
JInvocation textChangeCall = activityRef.invoke(methodName);
methodBody.add(textChangeCall);
JInvocation textChangeCall = methodBody.invoke(activityRef, methodName);

for (int i = 0; i < parameters.size(); i++) {
if (i == editableParameterPosition) {
Expand Down
3 changes: 1 addition & 2 deletions ...s/src/main/java/org/androidannotations/internal/core/handler/BeforeTextChangeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@ public void process(Element element, EComponentWithViewSupportHolder holder) thr
JBlock methodBody = textWatcherHolder.getBeforeTextChangedBody();

IJExpression activityRef = holder.getGeneratedClass().staticRef("this");
JInvocation textChangeCall = activityRef.invoke(methodName);
methodBody.add(textChangeCall);
JInvocation textChangeCall = methodBody.invoke(activityRef, methodName);

for (int i = 0; i < parameters.size(); i++) {
if (i == startParameterPosition) {
Expand Down
Loading

0 comments on commit 12d1ed9

Please sign in to comment.