WonderCsabo · Dec 20, 2015 · Sep 20, 2015 · Oct 11, 2015 · Sep 20, 2015 · Sep 20, 2015
diff --git a/...ons-core/androidannotations-api/src/main/java/org/androidannotations/annotations/App.java b/...ons-core/androidannotations-api/src/main/java/org/androidannotations/annotations/App.java
@@ -42,6 +42,12 @@
  * 
  * 	&#064;App
  * 	MyApplication myApp;
+ * 
+ * 	&#064;App
+ * 	void methodInjection(MyApplication app) {
+ * 		// do stuff
+ * 	}
+ * 
  * }
  * </pre>
  * 
@@ -50,6 +56,6 @@
  * @see EApplication
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface App {
 }
diff --git a/...ns-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Bean.java b/...ns-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Bean.java
@@ -42,6 +42,24 @@
  * 	&#064;Bean(MyBean2.class)
  * 	MyBean myBean2;
  * 
+ * 	&#064;Bean
+ * 	void singleInjection(MyBean bean) {
+ * 		// do stuff
+ * 	}
+ * 
+ * 	&#064;Bean(MyBean2.class)
+ * 	void singleInjection2(MyBean bean) {
+ * 		// do stuff
+ * 	}
+ * 
+ * 	void multiInjection(&#064;Bean MyBean bean1, &#064;Bean MyBean bean2) {
+ * 		// do stuff
+ * 	}
+ * 
+ * 	void multiInjection2(&#064;Bean(MyBean2.class) MyBean bean1, &#064;Bean(MyBean2.class) MyBean bean2) {
+ * 		// do stuff
+ * 	}
+ * 
  * }
  * 
  * &#064;EBean
@@ -58,7 +76,7 @@
  * @see EBean
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface Bean {
 
 	/**

diff --git a/...s-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java b/...s-core/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java
@@ -24,15 +24,15 @@
  * <p>
  * Use on any native, {@link android.os.Parcelable Parcelable} or
  * {@link java.io.Serializable Serializable} field in an {@link EActivity}
- * annotated class to bind it with Android's arguments.
- * If <a href="http://parceler.org">Parceler</a> is on the classpath, extras
+ * annotated class to bind it with Android's arguments. If
+ * <a href="http://parceler.org">Parceler</a> is on the classpath, extras
  * annotated with &#064;Parcel, or collections supported by Parceler will be
  * automatically marshaled using a {@link android.os.Parcelable Parcelable}
  * through the Parcels utility class.
  * </p>
  * <p>
- * The annotation value is the key used for extra. If not set, the field name
- * will be used as the key.
+ * The annotation value is the key used for extra. If not set, the field or
+ * method name will be used as the key.
  * </p>
  * <p>
  * When {@link Extra} is used, the intent builder will hold dedicated methods
@@ -68,6 +68,15 @@
  * 	&#064;Extra
  * 	String myMessage;
  * 
+ * 	&#064;Extra
+ * 	void singleInjection(String myMessage) {
+ * 		// do stuff
+ * 	}
+ *
+ * 	void multiInjection(&#064;Extra String myMessage, &#064;Extra String myMessage2) {
+ * 		// do stuff
+ * 	}
+ * 
  * 	&#064;AfterInject
  * 	void init() {
  * 		Log.d(&quot;AA&quot;, &quot;extra myMessage = &quot; + myMessage);
@@ -81,7 +90,7 @@
  * @see EActivity
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface Extra {
 
 	/**

diff --git a/.../androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java b/.../androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java
@@ -24,15 +24,15 @@
  * <p>
  * Use on any native, {@link android.os.Parcelable Parcelable} or
  * {@link java.io.Serializable Serializable} field in an {@link EFragment}
- * annotated class to bind it with Android's arguments.
- * If <a href="http://parceler.org">Parceler</a> is on the classpath, extras
+ * annotated class to bind it with Android's arguments. If
+ * <a href="http://parceler.org">Parceler</a> is on the classpath, extras
  * annotated with &#064;Parcel, or collections supported by Parceler will be
  * automatically marshaled using a {@link android.os.Parcelable Parcelable}
  * through the Parcels utility class.
  * </p>
  * <p>
- * The annotation value is the key used for argument. If not set, the field name
- * will be used as the key.
+ * The annotation value is the key used for argument. If not set, the field or
+ * method name will be used as the key.
  * </p>
  * <p>
  * When {@link FragmentArg} is used, the intent builder will hold dedicated
@@ -52,6 +52,15 @@
  * 
  * 	&#064;FragmentArg
  * 	String myMessage;
+ * 
+ * 	&#064;FragmentArg
+ * 	void singleInjection(String myMessage) {
+ * 		// do stuff
+ * 	}
+ *
+ * 	void multiInjection(&#064;FragmentArg String myMessage, &#064;FragmentArg String myMessage2) {
+ * 		// do stuff
+ * 	}
  * }
  * 
  * &#064;EActivity
@@ -73,7 +82,7 @@
  * @see FragmentByTag
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface FragmentArg {
 
 	/**

diff --git a/...androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentById.java b/...androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentById.java
@@ -22,12 +22,13 @@
 
 /**
  * <p>
- * Use it on android.app.Fragment or android.support.v4.app.Fragment fields in
- * activity classes to retrieve and inject a fragment.
+ * Use it on android.app.Fragment or android.support.v4.app.Fragment fields or
+ * methods with applicable parameters in activity classes to retrieve and inject
+ * a fragment.
  * </p>
  * <p>
- * The annotation value should be one of R.id.* fields. If not set, the field
- * name will be used as the R.id.* field name.
+ * The annotation value should be one of R.id.* fields. If not set, the field or
+ * method name will be used as the R.id.* field name.
  * </p>
  * <p>
  * <b>Note:</b> This can only inject an existing fragment, not create them.
@@ -59,6 +60,15 @@
  * 	
  * 	&#064;FragmentById(R.id.<b>myFragment</b>)
  * 	public MyFragment myFragment2;
+ * 
+ * 	&#064;FragmentById
+ * 	void singleInjection(MyFragment myFragment) {
+ * 		// do stuff	
+ * 	}	
+ *
+ * 	void multiInjection(&#064;FragmentById MyFragment myFragment, &#064;FragmentById(R.id.<b>myFragment</b>) MyFragment myFragment2) {
+ * 		// do stuff	
+ * 	}
  * }
  * </pre>
  * 
@@ -106,7 +116,7 @@
  * @see FragmentByTag
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface FragmentById {
 
 	/**

diff --git a/...ndroidannotations-api/src/main/java/org/androidannotations/annotations/FragmentByTag.java b/...ndroidannotations-api/src/main/java/org/androidannotations/annotations/FragmentByTag.java
@@ -22,12 +22,13 @@
 
 /**
  * <p>
- * Use it on android.app.Fragment or android.support.v4.app.Fragment fields in
- * activity classes to retrieve and inject a fragment.
+ * Use it on android.app.Fragment or android.support.v4.app.Fragment fields or
+ * methods with applicable parameters in activity classes to retrieve and inject
+ * a fragment.
  * </p>
  * <p>
- * The annotation value should be one of fragment tag. If not set, the field
- * name will be used as the tag name.
+ * The annotation value should be one of fragment tag. If not set, the field or
+ * method name will be used as the tag name.
  * </p>
  * <p>
  * <b>Note:</b> This can only inject an existing fragment, not create them.
@@ -60,6 +61,15 @@
  * 	
  * 	&#064;FragmentByTag(<b>"myFragmentTag"</b>)
  * 	public MyFragment myFragmentTag2;
+ * 
+ * 	&#064;FragmentByTag
+ * 	void singleInjection(MyFragment myFragmentTag) {
+ * 		// do stuff	
+ * 	}	
+ *
+ * 	void multiInjection(&#064;FragmentByTag MyFragment myFragmentTag, &#064;FragmentById("myFragmentTag") MyFragment myFragment2) {
+ * 		// do stuff	
+ * 	}
  * }
  * </pre>
  * 
@@ -108,7 +118,7 @@
  * @see FragmentById
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface FragmentByTag {
 
 	/**

diff --git a/.../androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java b/.../androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java
@@ -87,7 +87,7 @@
  * </blockquote>
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface HttpsClient {
 
 	/**

diff --git a/...e/androidannotations-api/src/main/java/org/androidannotations/annotations/InjectMenu.java b/...e/androidannotations-api/src/main/java/org/androidannotations/annotations/InjectMenu.java
@@ -26,7 +26,7 @@
  * inject the menu.
  * </p>
  * <p>
- * The field MUST be of type {@link android.view.Menu}.
+ * The field or method parameter MUST be of type {@link android.view.Menu}.
  * </p>
  *
  * <blockquote>
@@ -39,13 +39,18 @@
  *
  * 	&#064;InjectMenu
  * 	Menu menu;
+ * 
+ * 	&#064;InjectMenu
+ * 	void methodInjection(Menu menu) {
+ * 		// do stuff
+ * 	}
  *
  * }
  * </pre>
  *
  * </blockquote>
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface InjectMenu {
 }
diff --git a/...roidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenuItem.java b/...roidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenuItem.java
@@ -26,7 +26,7 @@
  * activity classes to inject a menu item.
  * </p>
  * <p>
- * The field MUST be of type {@link android.view.MenuItem}
+ * The field or method parameter MUST be of type {@link android.view.MenuItem}
  * </p>
  * <p>
  * The annotation value should be one or several of R.id.* fields. If not set,
@@ -47,13 +47,22 @@
  * 
  * 	&#064;OptionsMenuItem(R.id.menu_search)
  * 	MenuItem menuItemSearch;
+ * 
+ * 	&#064;OptionsMenuItem
+ * 	void singleInjection(MenuItem menuRefresh) {
+ * 		// do stuff
+ * 	}
+ *
+ * 	void multiInjection(&#064;OptionsMenuItem MenuItem menuRefresh, &#064;OptionsMenuItem(R.id.menu_search) MenuItem menuItemSearch) {
+ * 		// do stuff
+ * 	}
  * }
  * </pre>
  * 
  * </blockquote>
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface OptionsMenuItem {
 
 	/**

diff --git a/...roidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceByKey.java b/...roidannotations-api/src/main/java/org/androidannotations/annotations/PreferenceByKey.java
@@ -25,7 +25,7 @@
  * Use it on a {@link android.preference.Preference Preference} or
  * {@link android.preference.Preference Preference} subtype or
  * <code>android.support.v7.preference.Preference</code> or
- * <code>android.support.v7.preference.Preference</code> subtype fields in a
+ * <code>android.support.v7.preference.Preference</code> subtype fields or methods with applicable parameters in a
  * {@link org.androidannotations.annotations.EActivity EActivity} or
  * {@link org.androidannotations.annotations.EFragment EFragment} annotated
  * class, which is a subclass of {@link android.preference.PreferenceActivity
@@ -53,6 +53,15 @@
  * 	&#064;PreferenceByKey(R.string.checkBoxPref)
  * 	CheckBoxPreference checkBoxPref;
  * 
+ * 	&#064;PreferenceByKey
+ * 	void singleInjection(Preference myPreference1) {
+ * 		// do stuff	
+ * 	}	
+ *
+ * 	void multiInjection(&#064;PreferenceByKey Preference myPreference1, &#064;PreferenceByKey(R.string.checkBoxPref) CheckBoxPreference checkBoxPref) {
+ * 		// do stuff	
+ * 	}
+ * 
  * 	&#064;AfterPreferences
  * 	void initPrefs() {
  * 		checkBoxPref.setChecked(false);
@@ -65,7 +74,7 @@
  * @see org.androidannotations.annotations.AfterPreferences AfterPreferences
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface PreferenceByKey {
 
 	int value() default ResId.DEFAULT_VALUE;

diff --git a/.../androidannotations-api/src/main/java/org/androidannotations/annotations/RootContext.java b/.../androidannotations-api/src/main/java/org/androidannotations/annotations/RootContext.java
@@ -53,12 +53,21 @@
  * 	// Only injected if the root context is an instance of MyActivity
  * 	&#064;RootContext
  * 	MyActivity myActivity;
+ * 
+ * 	&#064;RootContext
+ * 	void singleInjection(Context context) {
+ * 		// do stuff
+ * 	}
+ *
+ * 	void multiInjection(&#064;RootContext Context context, &#064;RootContext Activity activity) {
+ * 		// do stuff
+ * 	}
  * }
  * </pre>
  *
  * </blockquote>
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface RootContext {
 }
diff --git a/...ndroidannotations-api/src/main/java/org/androidannotations/annotations/SystemService.java b/...ndroidannotations-api/src/main/java/org/androidannotations/annotations/SystemService.java
@@ -38,16 +38,25 @@
  * 
  * 	&#064;SystemService
  * 	AlarmManager alarmManager;
+ * 
+ * 	&#064;SystemService
+ * 	void singleInjection(NotificationManager notificationManager) {
+ * 		// do stuff
+ * 	}
+ *
+ * 	void multiInjection(&#064;SystemService NotificationManager notificationManager, &#064;SystemService AlarmManager alarmManager) {
+ * 		// do stuff
+ * 	}
  * }
  * </pre>
  * 
  * </blockquote>
  * 
- * @see <a
- *      href="https://developer.android.com/reference/android/content/Context.html#getSystemService%28java.lang.String%29"
+ * @see <a href=
+ *      "https://developer.android.com/reference/android/content/Context.html#getSystemService%28java.lang.String%29"
  *      >List of SystemService managers</a>
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface SystemService {
 }