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

Extra field names are now referencing generated public constants. #442

Merged
pyricau merged 1 commit into from
Dec 27, 2012
Merged

Extra field names are now referencing generated public constants. #442

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
Extra field names are now referencing generated public constants. See #… 
…441
  • Loading branch information
@pyricau
pyricau committed Dec 27, 2012
commit 1e79d729ca0cacd748873f0f91c3da74e4d57023
4 changes: 4 additions & 0 deletions ...nnotations/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,8 @@ public static String camelCaseToSnakeCase(String camelCase) {
}
}

public static String camelCaseToUpperSnakeCase(String camelCase) {
return camelCaseToSnakeCase(camelCase).toUpperCase();
}

}
27 changes: 21 additions & 6 deletions ...ns/androidannotations/src/main/java/org/androidannotations/processing/ExtraProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,18 @@
*/
package org.androidannotations.processing;

import static org.androidannotations.helper.CanonicalNameConstants.PARCELABLE;
import static org.androidannotations.helper.CanonicalNameConstants.STRING;
import static com.sun.codemodel.JExpr._null;
import static com.sun.codemodel.JExpr._super;
import static com.sun.codemodel.JExpr._this;
import static com.sun.codemodel.JExpr.cast;
import static com.sun.codemodel.JExpr.invoke;
import static com.sun.codemodel.JExpr.lit;
import static com.sun.codemodel.JMod.FINAL;
import static com.sun.codemodel.JMod.PRIVATE;
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.STRING;

import java.lang.annotation.Annotation;

Expand All @@ -36,13 +39,16 @@

import org.androidannotations.annotations.Extra;
import org.androidannotations.helper.APTCodeModelHelper;
import org.androidannotations.helper.CaseHelper;
import org.androidannotations.processing.EBeansHolder.Classes;

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JCatchBlock;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JExpr;
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;
Expand Down Expand Up @@ -89,7 +95,16 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
injectExtras(holder, codeModel);
}

JBlock ifContainsKey = holder.extrasNotNullBlock._if(JExpr.invoke(holder.extras, "containsKey").arg(extraKey))._then();
String staticFieldName;
if (fieldName.endsWith("Extra")) {
staticFieldName = CaseHelper.camelCaseToUpperSnakeCase(fieldName);
} else {
staticFieldName = CaseHelper.camelCaseToUpperSnakeCase(fieldName + "Extra");
}

JFieldVar extraKeyField = holder.generatedClass.field(PUBLIC | STATIC | FINAL, classes.STRING, staticFieldName, lit(extraKey));

JBlock ifContainsKey = holder.extrasNotNullBlock._if(JExpr.invoke(holder.extras, "containsKey").arg(extraKeyField))._then();

JTryBlock containsKeyTry = ifContainsKey._try();

Expand All @@ -98,9 +113,9 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
if (isPrimitive) {
JPrimitiveType primitiveType = JType.parse(codeModel, elementType.toString());
JClass wrapperType = primitiveType.boxify();
containsKeyTry.body().assign(extraField, JExpr.cast(wrapperType, holder.extras.invoke("get").arg(extraKey)));
containsKeyTry.body().assign(extraField, JExpr.cast(wrapperType, holder.extras.invoke("get").arg(extraKeyField)));
} else {
containsKeyTry.body().assign(extraField, JExpr.invoke(holder.cast).arg(holder.extras.invoke("get").arg(extraKey)));
containsKeyTry.body().assign(extraField, JExpr.invoke(holder.cast).arg(holder.extras.invoke("get").arg(extraKeyField)));
}

JCatchBlock containsKeyCatch = containsKeyTry._catch(classes.CLASS_CAST_EXCEPTION);
Expand Down Expand Up @@ -139,7 +154,7 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
JClass paramClass = helper.typeMirrorToJClass(extraType, holder);
JVar extraParam = method.param(paramClass, fieldName);
JBlock body = method.body();
JInvocation invocation = body.invoke(holder.intentField, "putExtra").arg(extraKey);
JInvocation invocation = body.invoke(holder.intentField, "putExtra").arg(extraKeyField);
if (castToSerializable) {
invocation.arg(cast(classes.SERIALIZABLE, extraParam));
} else {
Expand Down