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

1235 do not use methodname as action #1236

Merged
yDelouis merged 2 commits into from
May 24, 2015
Merged

1235 do not use methodname as action #1236

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a089735
add test for multiple actions with @ReceiverAction
dodgex Nov 11, 2014
f9b40c7
do not use the method name as action for @ReceiverAction
dodgex Nov 11, 2014
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
do not use the method name as action for @ReceiverAction
  • Loading branch information
@dodgex
dodgex committed May 5, 2015
commit f9b40c78c12025b0fc77ed7bf819f66f8e22e395
10 changes: 4 additions & 6 deletions ...droidannotations-api/src/main/java/org/androidannotations/annotations/ReceiverAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
/**
* <p>
* Should be used on a method that must respond to a specific action in an
* {@link EReceiver} annotated class. The method name will be used as action
* name unless the {@link #value()} field is set.
* {@link EReceiver} annotated class.
* </p>
* <p>
* The class MAY contain several {@link ReceiverAction} annotated methods.
Expand Down Expand Up @@ -94,12 +93,11 @@
public @interface ReceiverAction {

/**
* Define a set of actions this method should handle. If this field isn't
* set the annotated method name will be used.
*
* Define a set of actions this method should handle.
*
* @return the actions
*/
String[] value() default {};
String[] actions();

/**
* Define a set of data schemes to filter the Intent. If this field isn't
Expand Down
5 changes: 1 addition & 4 deletions ...ndroidannotations/src/main/java/org/androidannotations/handler/ReceiverActionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,7 @@ public void process(Element element, EReceiverHolder holder) throws Exception {

ReceiverAction annotation = element.getAnnotation(ReceiverAction.class);
String[] dataSchemes = annotation.dataSchemes();
String[] actions = annotation.value();
if (actions.length == 0) {
actions = new String[] { methodName };
}
String[] actions = annotation.actions();

JFieldVar actionKeyField = createStaticField(holder, "actions", methodName, actions);
JFieldVar dataSchemesField = createStaticField(holder, "dataSchemes", methodName, dataSchemes);
Expand Down