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

572 enhanced service #601

Merged
DayS merged 11 commits into from
Sep 20, 2013
Merged

572 enhanced service #601

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
be954c9
Implement onHandleIntent for @EIntentService according to issue #572
DayS May 23, 2013
0e05794
Add @ServiceAction methods in IntentBuilder
DayS May 23, 2013
c9a53d3
Add functional tests
DayS May 23, 2013
a8686e6
Allow injection of bean and other AA annotations in @EIntentService
DayS May 23, 2013
883af2e
Fix a bug with primitives and stop execution as soon as an action match
DayS May 23, 2013
9d1b3ca
Refactoring common code between ServiceActionProcessor and ExtraProce…
DayS May 24, 2013
5b97589
Fix javadocs and rename some variables
DayS May 26, 2013
c1d25d3
Add functional tests
DayS May 26, 2013
84130ab
Check if there is duplicate method names
DayS May 29, 2013
d4dbebe
Merge branch 'develop' into 572_EnhancedService
DayS Sep 20, 2013
2a60e05
Update unit test to make them more readable
DayS Sep 20, 2013
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
Prev Previous commit
Next Next commit
Fix a bug with primitives and stop execution as soon as an action match
  • Loading branch information
@DayS
DayS committed May 24, 2013
commit 883af2e41c3e6633ee10171bee76cc109f7a31c9
9 changes: 4 additions & 5 deletions ...idannotations/src/main/java/org/androidannotations/processing/ServiceActionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,8 @@ public String getTarget() {
@Override
public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
ExecutableElement executableElement = (ExecutableElement) element;

String methodName = element.getSimpleName().toString();

TypeMirror elementType = element.asType();

Classes classes = holder.classes();

// Action field
Expand Down Expand Up @@ -128,11 +125,11 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
String paramName = param.getSimpleName().toString();
String extraParamName = paramName + "Extra";
JClass extraParamClass = helper.typeMirrorToJClass(param.asType(), holder);
boolean isPrimitive = false; // param.getKind().isPrimitive();
boolean isPrimitive = param.asType().getKind().isPrimitive();

JExpression extraInvok;
if (isPrimitive) {
JPrimitiveType primitiveType = JType.parse(codeModel, elementType.toString());
JPrimitiveType primitiveType = JType.parse(codeModel, param.asType().toString());
JClass wrapperType = primitiveType.boxify();
extraInvok = JExpr.cast(wrapperType, extras.invoke("get").arg(paramName));
} else {
Expand All @@ -149,6 +146,8 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
} else {
callActionBlock.add(callActionInvok);
}

callActionBlock._return();
}

/*
Expand Down