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

Don't add the extra method in IntentBuilder with @ServiceAction #1214

Merged
WonderCsabo merged 1 commit into from
Nov 6, 2014
Merged

Don't add the extra method in IntentBuilder with @ServiceAction #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Don't add the extra method in IntentBuilder with @ServiceAction
  • Loading branch information
@yDelouis
yDelouis committed Nov 6, 2014
commit 9a0665314475ebd009b4472be93b05a255d72ff4
4 changes: 2 additions & 2 deletions ...androidannotations/src/main/java/org/androidannotations/handler/ServiceActionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ private void addActionToIntentBuilder(EIntentServiceHolder holder, ExecutableEle
JFieldVar paramVar = getStaticExtraField(holder, paramName);
JVar methodParam = method.param(parameterClass, paramName);

JMethod putExtraMethod = holder.getIntentBuilder().getPutExtraMethod(param.asType(), paramName, paramVar);
body.invoke(putExtraMethod).arg(methodParam);
JInvocation putExtraInvocation = holder.getIntentBuilder().getSuperPutExtraInvocation(param.asType(), methodParam, paramVar);
body.add(putExtraInvocation);
}
body._return(JExpr._this());
}
Expand Down
55 changes: 33 additions & 22 deletions ...tations/androidannotations/src/main/java/org/androidannotations/helper/IntentBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,16 @@
*/
package org.androidannotations.helper;

import com.sun.codemodel.*;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JClassAlreadyExistsException;
import com.sun.codemodel.JDefinedClass;
import com.sun.codemodel.JExpression;
import com.sun.codemodel.JFieldRef;
import com.sun.codemodel.JFieldVar;
import com.sun.codemodel.JInvocation;
import com.sun.codemodel.JMethod;
import com.sun.codemodel.JMod;
import com.sun.codemodel.JVar;
import org.androidannotations.holder.HasIntentBuilder;

import javax.lang.model.type.TypeKind;
Expand All @@ -25,9 +34,15 @@
import java.util.HashMap;
import java.util.Map;

import static com.sun.codemodel.JExpr.*;
import static com.sun.codemodel.JMod.*;
import static org.androidannotations.helper.CanonicalNameConstants.*;
import static com.sun.codemodel.JExpr._new;
import static com.sun.codemodel.JExpr._super;
import static com.sun.codemodel.JExpr.cast;
import static com.sun.codemodel.JExpr.ref;
import static com.sun.codemodel.JMod.PUBLIC;
import static com.sun.codemodel.JMod.STATIC;
import static org.androidannotations.helper.CanonicalNameConstants.PARCELABLE;
import static org.androidannotations.helper.CanonicalNameConstants.SERIALIZABLE;
import static org.androidannotations.helper.CanonicalNameConstants.STRING;

public abstract class IntentBuilder {

Expand Down Expand Up @@ -91,37 +106,33 @@ public JMethod getPutExtraMethod(TypeMirror elementType, String parameterName, J
}

private JMethod addPutExtraMethod(TypeMirror elementType, String parameterName, JFieldVar extraKeyField) {
boolean castToSerializable = false;
boolean castToParcelable = false;
JMethod method = holder.getIntentBuilderClass().method(PUBLIC, holder.getIntentBuilderClass(), parameterName);
JClass parameterClass = codeModelHelper.typeMirrorToJClass(elementType, holder);
JVar extraParameterVar = method.param(parameterClass, parameterName);
JInvocation superCall = getSuperPutExtraInvocation(elementType, extraParameterVar, extraKeyField);
method.body()._return(superCall);
return method;
}

public JInvocation getSuperPutExtraInvocation(TypeMirror elementType, JVar extraParam, JFieldVar extraKeyField) {
JExpression extraParameterArg = extraParam;
// Cast to Parcelable or Serializable if needed
if (elementType.getKind() == TypeKind.DECLARED) {
Elements elementUtils = holder.processingEnvironment().getElementUtils();
TypeMirror parcelableType = elementUtils.getTypeElement(PARCELABLE).asType();
if (!typeUtils.isSubtype(elementType, parcelableType)) {
TypeMirror stringType = elementUtils.getTypeElement(STRING).asType();

@WonderCsabo WonderCsabo Nov 6, 2014

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Nice refactor on these two methods.

if (!typeUtils.isSubtype(elementType, stringType)) {
castToSerializable = true;
extraParameterArg = cast(holder.classes().SERIALIZABLE, extraParameterArg);
}
} else {
TypeMirror serializableType = elementUtils.getTypeElement(SERIALIZABLE).asType();
if (typeUtils.isSubtype(elementType, serializableType)) {
castToParcelable = true;
extraParameterArg = cast(holder.classes().PARCELABLE, extraParameterArg);
}
}
}

JMethod method = holder.getIntentBuilderClass().method(PUBLIC, holder.getIntentBuilderClass(), parameterName);
JClass parameterClass = codeModelHelper.typeMirrorToJClass(elementType, holder);
JVar extraParameterVar = method.param(parameterClass, parameterName);
JInvocation invocation = _super().invoke("extra").arg(extraKeyField);
if (castToSerializable) {
invocation.arg(cast(holder.classes().SERIALIZABLE, extraParameterVar));
} else if (castToParcelable) {
invocation.arg(cast(holder.classes().PARCELABLE, extraParameterVar));
} else {
invocation.arg(extraParameterVar);
}
method.body()._return(invocation);
return method;
return _super().invoke("extra").arg(extraKeyField).arg(extraParameterArg);
}

protected abstract JClass getSuperClass();
Expand Down