From edf3791e6ebcff6e8e98c1dfed3ca3f83c0edca4 Mon Sep 17 00:00:00 2001

From: WonderCsabo <[email protected]>

Date: Fri, 29 Aug 2014 19:29:04 +0200

Subject: [PATCH 1/5] Add checkstyle

---

.../annotations/AfterTextChange.java | 6 +-

.../androidannotations/annotations/AfterViews.java | 5 +-

.../androidannotations/annotations/Background.java | 26 ++-

.../org/androidannotations/annotations/EView.java | 6 +-

.../org/androidannotations/annotations/Extra.java | 13 +-

.../annotations/FragmentArg.java | 8 +-

.../androidannotations/annotations/FromHtml.java | 8 +-

.../annotations/HttpsClient.java | 2 +-

.../androidannotations/annotations/NoTitle.java | 8 +-

.../annotations/OnActivityResult.java | 39 ++--

.../androidannotations/annotations/OrmLiteDao.java | 6 +

.../annotations/SeekBarTouchStart.java | 11 +-

.../annotations/SeekBarTouchStop.java | 11 +-

.../annotations/SupposeBackground.java | 42 ++--

.../annotations/SupposeUiThread.java | 16 +-

.../org/androidannotations/annotations/Touch.java | 10 +-

.../org/androidannotations/annotations/Trace.java | 6 +-

.../androidannotations/annotations/UiThread.java | 7 +-

.../annotations/res/AnimationRes.java | 4 +-

.../annotations/res/BooleanRes.java | 4 +-

.../annotations/res/ColorRes.java | 4 +-

.../annotations/res/ColorStateListRes.java | 4 +-

.../annotations/res/DimensionPixelOffsetRes.java | 4 +-

.../annotations/res/DimensionPixelSizeRes.java | 4 +-

.../annotations/res/DimensionRes.java | 4 +-

.../annotations/res/DrawableRes.java | 4 +-

.../annotations/res/HtmlRes.java | 4 +-

.../annotations/res/IntArrayRes.java | 4 +-

.../annotations/res/IntegerRes.java | 4 +-

.../annotations/res/LayoutRes.java | 4 +-

.../annotations/res/MovieRes.java | 4 +-

.../annotations/res/StringArrayRes.java | 4 +-

.../annotations/res/StringRes.java | 4 +-

.../annotations/res/TextArrayRes.java | 4 +-

.../annotations/res/TextRes.java | 4 +-

.../annotations/rest/Accept.java | 5 +-

.../annotations/rest/Options.java | 3 +-

.../annotations/rest/RequiresAuthentication.java | 10 +-

.../annotations/rest/RequiresCookie.java | 7 +-

.../annotations/rest/RequiresCookieInUrl.java | 2 +-

.../annotations/rest/RequiresHeader.java | 5 +-

.../androidannotations/annotations/rest/Rest.java | 11 +-

.../annotations/rest/SetsCookie.java | 2 +-

.../sharedpreferences/DefaultBoolean.java | 4 +-

.../sharedpreferences/DefaultFloat.java | 4 +-

.../annotations/sharedpreferences/DefaultInt.java | 4 +-

.../annotations/sharedpreferences/DefaultLong.java | 4 +-

.../annotations/sharedpreferences/DefaultRes.java | 4 +-

.../sharedpreferences/DefaultString.java | 4 +-

.../annotations/sharedpreferences/Pref.java | 6 +-

.../annotations/sharedpreferences/SharedPref.java | 4 +-

.../androidannotations/api/BackgroundExecutor.java | 122 ++++++-----

.../androidannotations/api/SdkVersionHelper.java | 6 +-

.../org/androidannotations/api/ViewServer.java | 43 ++--

.../api/rest/RestClientHeaders.java | 40 ++--

.../api/roboguice/RoboGuiceHelper.java | 3 +

.../sharedpreferences/SharedPreferencesCompat.java | 12 +-

.../java/com/sun/codemodel/JSuperWildcard.java | 6 +-

.../AndroidAnnotationProcessor.java | 1 -

.../exception/ProcessingException.java | 2 +-

.../handler/AnnotationHandlers.java | 2 +-

.../androidannotations/handler/BeanHandler.java | 21 +-

.../handler/CheckedChangeHandler.java | 22 +-

.../handler/EActivityHandler.java | 16 +-

.../handler/EApplicationHandler.java | 8 +-

.../androidannotations/handler/EBeanHandler.java | 10 +-

.../handler/EFragmentHandler.java | 21 +-

.../handler/EIntentServiceHandler.java | 34 +--

.../handler/EProviderHandler.java | 8 +-

.../handler/EReceiverHandler.java | 8 +-

.../handler/EServiceHandler.java | 8 +-

.../handler/EViewGroupHandler.java | 11 +-

.../androidannotations/handler/EViewHandler.java | 8 +-

.../handler/EditorActionHandler.java | 25 ++-

.../androidannotations/handler/ExtraHandler.java | 52 ++---

.../handler/FocusChangeHandler.java | 10 +-

.../handler/FragmentArgHandler.java | 27 ++-

.../handler/IgnoredWhenDetachedHandler.java | 22 +-

.../handler/InstanceStateHandler.java | 25 +--

.../handler/ItemLongClickHandler.java | 25 ++-

.../handler/ItemSelectHandler.java | 24 ++-

.../handler/OnActivityResultHandler.java | 36 ++--

.../androidannotations/handler/PrefHandler.java | 6 +-

.../handler/ReceiverActionHandler.java | 3 +-

.../handler/ReceiverHandler.java | 3 +-

.../handler/RootContextHandler.java | 79 +++++++

.../handler/RootContextHanlder.java | 79 -------

.../handler/ServiceActionHandler.java | 239 +++++++++++----------

.../handler/SharedPrefHandler.java | 2 +-

.../handler/SupposeBackgroundHandler.java | 18 +-

.../handler/SupposeUiThreadHandler.java | 12 +-

.../androidannotations/handler/TouchHandler.java | 23 +-

.../androidannotations/handler/TraceHandler.java | 12 +-

.../handler/UiThreadHandler.java | 20 +-

.../handler/ViewByIdHandler.java | 15 +-

.../handler/ViewsByIdHandler.java | 30 +--

.../handler/WakeLockHandler.java | 4 +-

.../handler/rest/DeleteHandler.java | 6 +-

.../handler/rest/HeadHandler.java | 8 +-

.../handler/rest/OptionsHandler.java | 8 +-

.../handler/rest/PutHandler.java | 2 +-

.../handler/rest/RestHandler.java | 30 +--

.../handler/rest/RestMethodHandler.java | 13 +-

.../handler/rest/RestServiceHandler.java | 44 ++--

.../helper/APTCodeModelHelper.java | 73 ++++---

.../helper/ActionBarSherlockHelper.java | 5 +-

.../helper/ActivityIntentBuilder.java | 16 +-

.../androidannotations/helper/AndroidManifest.java | 4 +

.../helper/AnnotationArrayParamExtractor.java | 13 +-

.../helper/AnnotationHelper.java | 38 ++--

.../helper/AnnotationParamExtractor.java | 20 +-

.../androidannotations/helper/BundleHelper.java | 73 +++----

.../org/androidannotations/helper/CaseHelper.java | 15 +-

.../org/androidannotations/helper/FileHelper.java | 3 +

.../androidannotations/helper/IntentBuilder.java | 38 ++--

.../androidannotations/helper/OptionsHelper.java | 2 +-

.../helper/RestAnnotationHelper.java | 45 ++--

.../helper/ServiceIntentBuilder.java | 3 +-

.../androidannotations/helper/ValidatorHelper.java | 4 +-

.../helper/ValidatorParameterHelper.java | 23 +-

.../androidannotations/holder/EActivityHolder.java | 85 ++++----

.../org/androidannotations/holder/EBeanHolder.java | 11 +-

.../holder/EComponentHolder.java | 8 +-

.../holder/EComponentWithViewSupportHolder.java | 36 +++-

.../androidannotations/holder/EFragmentHolder.java | 49 ++---

.../holder/EIntentServiceHolder.java | 80 +++----

.../androidannotations/holder/EServiceHolder.java | 33 +--

.../org/androidannotations/holder/EViewHolder.java | 6 +-

.../androidannotations/holder/FoundViewHolder.java | 6 +-

.../holder/HasIntentBuilder.java | 9 +-

.../holder/OnActivityResultHolder.java | 14 +-

.../holder/ReceiverRegistrationHolder.java | 20 +-

.../androidannotations/holder/RoboGuiceHolder.java | 3 +

.../holder/SharedPrefHolder.java | 13 +-

.../androidannotations/logger/LoggerContext.java | 10 +-

.../androidannotations/logger/LoggerFactory.java | 3 +

.../logger/appender/FileAppender.java | 17 +-

.../androidannotations/process/ModelProcessor.java | 27 ++-

.../androidannotations/process/ProcessHolder.java | 3 +

.../androidannotations/rclass/IRInnerClass.java | 2 +-

.../rclass/ManifestPackageExtractor.java | 4 +-

.../androidannotations/ebean/SomeGenericBean.java | 4 +-

.../eviewgroup/SomeGenericViewGroup.java | 5 +-

.../eviewgroup/SomeGenericViewGroupExt.java | 3 +-

.../receiver/ActivityWithInvalidRegisterAt.java | 3 +-

.../receiver/ActivityWithTwoSameNameMethod.java | 5 +-

.../receiver/ActivityWithValidReceiver.java | 5 +-

.../receiver/FragmentWithValidReceiver.java | 5 +-

.../receiver/ReceiverRegistrationTest.java | 4 +-

.../receiver/ServiceWithInvalidReceiver.java | 5 +-

.../receiver/ServiceWithValidReceiver.java | 5 +-

AndroidAnnotations/checkstyle-checks.xml | 117 ++++++++++

AndroidAnnotations/functional-test-1-5/pom.xml | 5 +

.../actionbarsherlock/app/SherlockFragment.java | 67 +++---

.../main/java/com/actionbarsherlock/view/Menu.java | 4 +-

.../test15/ActivityWithGenerics.java | 17 +-

.../test15/AwaitingResultActivity.java | 17 +-

.../test15/AwaitingResultFragment.java | 26 +--

.../org/androidannotations/test15/CustomData.java | 17 +-

.../test15/FragmentArguments.java | 5 +-

.../test15/ItemClicksHandledActivity.java | 23 +-

.../test15/MultiFindViewActivity.java | 9 +-

.../test15/ebean/ThreadControlledBean.java | 8 +-

.../test15/efragment/MyFragment.java | 21 +-

.../test15/efragment/MyListFragment.java | 12 +-

.../eintentservice/IntentServiceHandledAction.java | 2 +-

.../test15/eprovider/MyProvider.java | 20 +-

.../test15/eservice/MyService.java | 16 +-

.../test15/eviewgroup/CustomFrameLayout.java | 30 +--

.../eviewgroup/CustomFrameLayoutActivity.java | 8 +-

.../ActivityWithInnerEnhancedClasses.java | 10 +-

.../innerclasses/BeanWithInnerEnhancedClasses.java | 5 +-

.../instancestate/MyGenericParcelableBean.java | 24 ++-

.../instancestate/MyGenericSerializableBean.java | 19 +-

.../test15/instancestate/MyParcelableBean.java | 20 +-

.../test15/instancestate/MySerializableBean.java | 20 +-

.../instancestate/SaveInstanceStateActivity.java | 14 +-

.../test15/menu/OptionsMenuActivity.java | 18 +-

.../test15/menu/OptionsMenuFragment.java | 12 +-

.../test15/menu/OptionsMenuSubActivity.java | 3 +

.../test15/menu/OptionsMenuSupportFragment.java | 12 +-

.../test15/ormlite/OrmLiteBean.java | 4 -

.../test15/prefs/InnerPrefs.java | 2 +-

.../androidannotations/test15/res/ResActivity.java | 14 +-

.../org/androidannotations/test15/rest/Event.java | 20 +-

.../test15/rest/HttpMethodsService.java | 3 +-

.../test15/roboguice/MapActivityWithRoboGuice.java | 4 -

.../test15/roboguice/SampleRoboApplication.java | 3 +-

.../test15/sherlock/MySherlockActivity.java | 22 +-

.../test15/sherlock/MySherlockFragment.java | 11 +-

.../test15/trace/TracedActivity.java | 12 +-

.../test15/ThreadActivityTest.java | 93 ++++----

.../test15/eintentservice/MyIntentServiceTest.java | 4 +-

.../test15/menu/OptionsMenuActivityTest.java | 2 +-

.../test15/sherlock/MySherlockActivityTest.java | 2 +-

AndroidAnnotations/pom.xml | 38 +++-

196 files changed, 1903 insertions(+), 1461 deletions(-)

create mode 100644 AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RootContextHandler.java

delete mode 100644 AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RootContextHanlder.java

create mode 100644 AndroidAnnotations/checkstyle-checks.xml

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java

index e06a828..f448bb0 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterTextChange.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.text.Editable;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -25,8 +23,8 @@

/**

* <p>

* This annotation is intended to be used on methods to receive events defined

- * by {@link android.text.TextWatcher#afterTextChanged(Editable s)} after the

- * text is changed on the targeted TextView or subclass of TextView.

+ * by {@link android.text.TextWatcher#afterTextChanged(android.text.Editable s)}

+ * after the text is changed on the targeted TextView or subclass of TextView.

* </p>

* <p>

* The annotation value should be one or several R.id.* fields that refers to

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java

index 9d3fd54..b2939af 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/AfterViews.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.app.Activity;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -25,7 +23,8 @@

/**

* <p>

* Methods annotated with @{@link AfterViews} will be called after

- * {@link Activity#setContentView(int)} is called by the generated activity.

+ * {@link android.app.Activity#setContentView(int) setContentView(int)} is

+ * called by the generated activity.

* </p>

* <p>

* This occurs AFTER <code>setContentView(View)</code> which is called at the

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java

index b3f63f7..e59a2c2 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java

@@ -19,8 +19,6 @@

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

-import java.util.concurrent.Future;

-import java.util.concurrent.ScheduledThreadPoolExecutor;

/**

* <p>

@@ -30,7 +28,9 @@

* The annotated method MUST return void and MAY contain parameters.

* </p>

* <p>

- * The generated code is based on {@link org.androidannotations.api.BackgroundExecutor} methods.

+ * The generated code is based on

+ * {@link org.androidannotations.api.BackgroundExecutor BackgroundExecutor}

+ * methods.

* </p>

*

* <h2>Cancellation</h2>

@@ -66,20 +66,25 @@

* <b>Note</b>: Cancellation may or may not be successful. If the task wasn't

* executed yet, it will be removed from the pool. But it could fail if task has

* already completed, has already been cancelled, or could not be cancelled for

- * some other reason. See {@link Future#cancel(boolean)} for more information.

+ * some other reason. See {@link java.util.concurrent.Future#cancel(boolean)

+ * Future#cancel(boolean)} for more information.

* </p>

*

* <h2>Execution flow</h2>

* <p>

- * By default, all tasks will be put in a {@link ScheduledThreadPoolExecutor}

- * with a core pool size of <code>2 * numberOfCpu</code>. Which means that

- * background methods will be executed in <b>PARALLEL</b>. You can change this

- * by calling <code>BackgroundExecutor.setExecutor(...)</code>.

+ * By default, all tasks will be put in a

+ * {@link java.util.concurrent.ScheduledThreadPoolExecutor

+ * ScheduledThreadPoolExecutor} with a core pool size of

+ * <code>2 * numberOfCpu</code>. Which means that background methods will be

+ * executed in <b>PARALLEL</b>. You can change this by calling

+ * <code>BackgroundExecutor.setExecutor(...)</code>.

* </p>

* <p>

* If you want execute ALL background methods SEQUENTIALLY, the best way is to

- * change the executor of {@link org.androidannotations.api.BackgroundExecutor} to a

- * {@link ScheduledThreadPoolExecutor} with a core pool size of <code>1</code>.

+ * change the executor of {@link org.androidannotations.api.BackgroundExecutor

+ * BackgroundExecutor} to a

+ * {@link java.util.concurrent.ScheduledThreadPoolExecutor

+ * ScheduledThreadPoolExecutor} with a core pool size of <code>1</code>.

* </p>

* <p>

* If you want execute some background methods SEQUENTIALLY, you should simply

@@ -146,6 +151,7 @@

* <b>Example</b> :

*

* <blockquote>

+ *

* <pre>

* &#064;EBean

* public class MyBean {

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java

index 004cc80..99b08a5 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/EView.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.view.ViewGroup;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -24,7 +22,7 @@

/**

* <p>

- * Should be used on {@link android.view.View} classes to enable usage of

+ * Should be used on {@link android.view.View View} classes to enable usage of

* AndroidAnnotations.

* </p>

* <p>

@@ -62,7 +60,7 @@

*

* @see AfterInject

* @see AfterViews

- * @see ViewGroup

+ * @see android.view.ViewGroup

* @see <a

* href="http://developer.android.com/guide/topics/ui/custom-components.html"

* >How to build a custom component.</a>

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java

index 5b33539..80b3b5b 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Extra.java

@@ -15,10 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.app.Activity;

-import android.os.Parcelable;

-

-import java.io.Serializable;

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -26,8 +22,9 @@

/**

* <p>

- * Use on any native, {@link Parcelable} or {@link Serializable} field in an

- * {@link EActivity} annotated class to bind it with Android's extra.

+ * 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 extra.

* </p>

* <p>

* The annotation value is the key used for extra. If not set, the field name

@@ -42,8 +39,8 @@

* annotated method.

* </p>

* <p>

- * Calling {@link Activity#setIntent(android.content.Intent)} will automatically

- * update the annotated extras.

+ * Calling {@link android.app.Activity#setIntent(android.content.Intent)

+ * Activity#setIntent(Intent)} will automatically update the annotated extras.

* </p>

* <blockquote>

*

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java

index ad9b3b3..6b17c13 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java

@@ -15,9 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.os.Parcelable;

-

-import java.io.Serializable;

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -25,8 +22,9 @@

/**

* <p>

- * Use on any native, {@link Parcelable} or {@link Serializable} field in an

- * {@link EFragment} annotated class to bind it with Android's arguments.

+ * 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.

* </p>

* <p>

* The annotation value is the key used for argument. If not set, the field name

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java

index 7259093..3839765 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/FromHtml.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import org.androidannotations.annotations.res.HtmlRes;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -24,8 +22,8 @@

/**

* <p>

- * Use on a {@link android.widget.TextView} field or a

- * {@link android.widget.TextView} subclass field annotated with

+ * Use on a {@link android.widget.TextView TextView} field or a

+ * {@link android.widget.TextView TextView} subclass field annotated with

* {@link ViewById} to inject text as HTML.

* </p>

* <p>

@@ -55,7 +53,7 @@

* </blockquote>

*

* @see ViewById

- * @see HtmlRes

+ * @see org.androidannotations.annotations.res.HtmlRes

*/

@Retention(RetentionPolicy.CLASS)

@Target(ElementType.FIELD)

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java

index 88fc10e..d32a707 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java

@@ -89,7 +89,7 @@

@Retention(RetentionPolicy.CLASS)

@Target(ElementType.FIELD)

public @interface HttpsClient {

- public static final String DEFAULT_PASSWD = "changeit";

+ String DEFAULT_PASSWD = "changeit";

int trustStore() default ResId.DEFAULT_VALUE;

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java

index f665378..2d7e240 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java

@@ -24,12 +24,12 @@

* <p>

* Should be used on {@link EActivity} classes that must have no title.

* </p>

- * <p>

- * <b>Note:</b> This annotation has been deprecated. Please use

- * <code>&#064;WindowFeature(Window.FEATURE_NO_TITLE})</code> instead

- * </p>

*

* @see WindowFeature

+ *

+ * @deprecated Please use

+ * <code>&#064;WindowFeature(Window.FEATURE_NO_TITLE})</code>

+ * instead

*/

@Deprecated

@Retention(RetentionPolicy.CLASS)

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java

index e9797c0..de12ea8 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OnActivityResult.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.content.Intent;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -26,9 +24,9 @@

* <p>

* This annotation is intended to be used on methods to receive results from a

* previously started activity using

- * {@link android.app.Activity#startActivityForResult(Intent, int)} or the

- * generated <code>IntentBuilder.startActivityForResult()</code> method of the

- * activity.

+ * {@link android.app.Activity#startActivityForResult(android.content.Intent, int)

+ * Activity#startActivityForResult(Intent, int)} or the generated

+ * <code>IntentBuilder.startActivityForResult()</code> method of the activity.

* </p>

* <p>

* The annotation value must be an integer constant that represents the

@@ -38,10 +36,13 @@

* The method may have multiple parameter :

* </p>

* <ul>

- * <li>A {@link android.content.Intent} that contains data</li>

- * <li>An <code>int</code> or an {@link java.lang.Integer} to get the resultCode</li>

- * <li>Any native, {@link android.os.Parcelable} or {@link java.io.Serializable} parameter

- * annotated with {@link org.androidannotations.annotations.OnActivityResult.Extra} to get an object put in the extras of the intent.</li>

+ * <li>A {@link android.content.Intent Intent} that contains data</li>

+ * <li>An <code>int</code> or an {@link java.lang.Integer Integer} to get the

+ * resultCode</li>

+ * <li>Any native, {@link android.os.Parcelable Parcelable} or

+ * {@link java.io.Serializable Serializable} parameter annotated with

+ * {@link org.androidannotations.annotations.OnActivityResult.Extra

+ * OnActivityResult.Extra} to get an object put in the extras of the intent.</li>

* </ul>

*

* <blockquote>

@@ -69,8 +70,8 @@

* </blockquote>

*

* @see EActivity

- * @see android.app.Activity#startActivityForResult(Intent, int)

- * @see android.app.Activity#onActivityResult(int, int, Intent)

+ * @see android.app.Activity#startActivityForResult(android.content.Intent, int)

+ * @see android.app.Activity#onActivityResult(int, int, android.content.Intent)

*/

@Retention(RetentionPolicy.CLASS)

@@ -81,12 +82,13 @@

/**

* <p>

- * Use on any native, {@link android.os.Parcelable} or {@link java.io.Serializable} parameter of an

- * {@link OnActivityResult} annotated method to bind it with the value from the Intent.

+ * Use on any native, {@link android.os.Parcelable} or

+ * {@link java.io.Serializable} parameter of an {@link OnActivityResult}

+ * annotated method to bind it with the value from the Intent.

* </p>

* <p>

- * The annotation value is the key used for the result data. If not set, the field name

- * will be used as the key.

+ * The annotation value is the key used for the result data. If not set, the

+ * field name will be used as the key.

* </p>

*

* <blockquote>

@@ -97,11 +99,11 @@

* &#064;OnActivityResult(REQUEST_CODE)

* void onResult(int resultCode, Intent data, <b>@Extra String value</b>) {

* }

- *

+ *

* &#064;OnActivityResult(REQUEST_CODE)

* void onResult(int resultCode, <b>@Extra(value = "key") String value</b>) {

* }

- *

+ *

* &#064;OnActivityResult(REQUEST_CODE)

* void onResult(<b>@Extra String strVal</b>, <b>@Extra int intVal</b>) {

* }

@@ -109,7 +111,8 @@

*

* </blockquote>

*

- * @see android.app.Activity#onActivityResult(int, int, Intent)

+ * @see android.app.Activity#onActivityResult(int, int,

+ * android.content.Intent)

* @see OnActivityResult

*/

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java

index 8782685..dee6596 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OrmLiteDao.java

@@ -69,6 +69,12 @@

Class<?> helper();

+ /**

+ *

+ * @deprecated Since <b>3.1</b> the model class is inferred from the type of

+ * the annotated field. This parameter will be removed in a

+ * future version.

+ */

@Deprecated

Class<?> model() default Void.class;

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java

index 5814d64..60f33d0 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStart.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.widget.SeekBar;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -26,8 +24,9 @@

* <p>

* This annotation is intended to be used on methods to receive events defined

* by

- * {@link android.widget.SeekBar.OnSeekBarChangeListener#onStartTrackingTouch(SeekBar seekBar)}

- * when the user begins to move the cursor of the targeted SeekBar.

+ * {@link android.widget.SeekBar.OnSeekBarChangeListener#onStartTrackingTouch(android.widget.SeekBar)

+ * SeekBar.OnSeekBarChangeListener#onStartTrackingTouch(SeekBar)} when the user

+ * begins to move the cursor of the targeted SeekBar.

* </p>

* <p>

* The annotation value should be one or several R.id.* fields that refers to an

@@ -38,8 +37,8 @@

* The method MAY have one parameter :

* </p>

* <ul>

- * <li>A {@link android.widget.SeekBar} parameter to determine which view has

- * targeted this event</li>

+ * <li>A {@link android.widget.SeekBar SeekBar} parameter to determine which

+ * view has targeted this event</li>

* </ul>

*

* <blockquote>

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java

index aef06df..8b696f4 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SeekBarTouchStop.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.widget.SeekBar;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -26,8 +24,9 @@

* <p>

* This annotation is intended to be used on methods to receive events defined

* by

- * {@link android.widget.SeekBar.OnSeekBarChangeListener#onStopTrackingTouch(SeekBar seekBar)}

- * when the user has finished to move the cursor of the targeted SeekBar.

+ * {@link android.widget.SeekBar.OnSeekBarChangeListener#onStopTrackingTouch(android.widget.SeekBar)

+ * SeekBar.OnSeekBarChangeListener#onStopTrackingTouch(SeekBar)} when the user

+ * has finished to move the cursor of the targeted SeekBar.

* </p>

* <p>

* The annotation value should be one or several R.id.* fields that refers to an

@@ -38,8 +37,8 @@

* The method MAY have one parameter :

* </p>

* <ul>

- * <li>A {@link android.widget.SeekBar} parameter to determine which view has

- * targeted this event</li>

+ * <li>A {@link android.widget.SeekBar SeekBar} parameter to determine which

+ * view has targeted this event</li>

* </ul>

*

* <blockquote>

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeBackground.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeBackground.java

index d53eb41..31c690a 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeBackground.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeBackground.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import org.androidannotations.api.BackgroundExecutor;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -24,44 +22,48 @@

/**

* <p>

- * Ensures that the method is called from the background thread with (optionally) restrictions by allowed serials.

- * If it is not called from a supposed background thread, then {@link IllegalStateException}

- * will be thrown (by default).

+ * Ensures that the method is called from the background thread with

+ * (optionally) restrictions by allowed serials. If it is not called from a

+ * supposed background thread, then {@link IllegalStateException} will be thrown

+ * (by default).

* </p>

* <blockquote> <b>Example</b> :

*

* <pre>

* &#064;EBean

* public class MyBean {

- *

+ *

* &#064;SupposeBackground

* boolean someMethodThatShouldNotBeCalledFromUiThread() {

- * //if this method will be called from the UI-thread an exception will be thrown

- * }

- *

- * &#064;SupposeBackground(serial = {"serial1", "serial2"})

+ * // if this method will be called from the UI-thread an exception will be

+ * // thrown

+ * }

+ *

+ * &#064;SupposeBackground(serial = { &quot;serial1&quot;, &quot;serial2&quot; })

* boolean someMethodThatShouldBeCalledFromSerial1OrSerial2() {

- * //if this method will be called from another thread then a background thread with a

- * //serial "serial1" or "serial2", an exception will be thrown

- * }

- *

+ * // if this method will be called from another thread then a background

+ * // thread with a

+ * // serial &quot;serial1&quot; or &quot;serial2&quot;, an exception will be thrown

+ * }

+ *

* }

* </pre>

+ *

* </blockquote>

*

- * @see BackgroundExecutor#setWrongThreadListener(BackgroundExecutor.WrongThreadListener)

- * @see BackgroundExecutor#DEFAULT_WRONG_THREAD_LISTENER

- * @see BackgroundExecutor#checkBgThread(String...)

+ * @see org.androidannotations.api.BackgroundExecutor#setWrongThreadListener(org.androidannotations.api.BackgroundExecutor.WrongThreadListener)

+ * @see org.androidannotations.api.BackgroundExecutor#DEFAULT_WRONG_THREAD_LISTENER

+ * @see org.androidannotations.api.BackgroundExecutor#checkBgThread(String...)

*/

@Retention(RetentionPolicy.CLASS)

@Target(ElementType.METHOD)

public @interface SupposeBackground {

/**

- * @return Allowed serials to restrict a calling thread. If it is an empty list,

- * then any background thread is allowed.

+ * @return Allowed serials to restrict a calling thread. If it is an empty

+ * list, then any background thread is allowed.

*

- * @see BackgroundExecutor#checkBgThread(String...)

+ * @see org.androidannotations.api.BackgroundExecutor#checkBgThread(String...)

*/

String[] serial() default {};

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeUiThread.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeUiThread.java

index 286557e..786c0ed 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeUiThread.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/SupposeUiThread.java

@@ -15,9 +15,6 @@

*/

package org.androidannotations.annotations;

-import org.androidannotations.api.BackgroundExecutor;

-

-import java.lang.IllegalStateException;

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -32,19 +29,20 @@

* <pre>

* &#064;EBean

* public class MyBean {

- *

+ *

* &#064;SupposeUiThread

* boolean someMethodThatShouldBeCalledOnlyFromUiThread() {

- * //if this method will be called from a background thread an exception will be thrown

- * }

+ * // if this method will be called from a background thread an exception

+ * // will be thrown

+ * }

* }

* </pre>

*

* </blockquote>

*

- * @see BackgroundExecutor#setWrongThreadListener(BackgroundExecutor.WrongThreadListener)

- * @see BackgroundExecutor#DEFAULT_WRONG_THREAD_LISTENER

- * @see BackgroundExecutor#checkUiThread()

+ * @see org.androidannotations.api.BackgroundExecutor#setWrongThreadListener(org.androidannotations.api.BackgroundExecutor.WrongThreadListener)

+ * @see org.androidannotations.api.BackgroundExecutor#DEFAULT_WRONG_THREAD_LISTENER

+ * @see org.androidannotations.api.BackgroundExecutor#checkUiThread()

*/

@Retention(RetentionPolicy.CLASS)

@Target(ElementType.METHOD)

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java

index 23228ad..15f7c71 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Touch.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.view.MotionEvent;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -26,8 +24,9 @@

* <p>

* This annotation is intended to be used on methods to receive events defined

* by

- * {@link android.view.View.OnTouchListener#onTouch(android.view.View, MotionEvent)}

- * when the view has been touched by the user.

+ * {@link android.view.View.OnTouchListener#onTouch(android.view.View, android.view.MotionEvent)

+ * View.OnTouchListener#onTouch(View, MotionEvent)} when the view has been

+ * touched by the user.

* </p>

* <p>

* The annotation value should be one or several of R.id.* fields. If not set,

@@ -42,7 +41,8 @@

* The method MAY have one or two parameters:

* </p>

* <ul>

- * <li>A {@link android.view.View} parameter to know which view has been clicked</li>

+ * <li>A {@link android.view.View} parameter to know which view has been clicked

+ * </li>

* <li>A {@link android.view.MotionEvent} parameter</li>

* </ul>

* <blockquote>

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java

index 62f8436..357cfe7 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Trace.java

@@ -15,13 +15,13 @@

*/

package org.androidannotations.annotations;

-import android.util.Log;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

+import android.util.Log;

+

/**

* <p>

* This annotation is intended to be used on methods to log at runtime the

@@ -72,7 +72,7 @@

@Target(ElementType.METHOD)

public @interface Trace {

- public static final String DEFAULT_TAG = "NO_TAG";

+ String DEFAULT_TAG = "NO_TAG";

String tag() default DEFAULT_TAG;

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java

index d94412f..8d462ce 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java

@@ -15,8 +15,6 @@

*/

package org.androidannotations.annotations;

-import android.os.Handler;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

@@ -90,7 +88,7 @@

* </blockquote>

*

* @see Background

- * @see Handler

+ * @see android.os.Handler

*/

@Retention(RetentionPolicy.CLASS)

@Target(ElementType.METHOD)

@@ -103,7 +101,8 @@

* using the handler. The default value is ENQUEUE, which will always call

* the handler.

*

- * @return whether the method should be posted or executed if it's in the UI thread

+ * @return whether the method should be posted or executed if it's in the UI

+ * thread

*/

Propagation propagation() default Propagation.ENQUEUE;

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java

index aeaab65..c844959 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/AnimationRes.java

@@ -15,13 +15,13 @@

*/

package org.androidannotations.annotations.res;

-import org.androidannotations.annotations.ResId;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

+import org.androidannotations.annotations.ResId;

+

/**

* <p>

* Use on {@link android.content.res.XmlResourceParser} fields in any enhanced

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java

index bf6e90b..8a4ceed 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/BooleanRes.java

@@ -15,13 +15,13 @@

*/

package org.androidannotations.annotations.res;

-import org.androidannotations.annotations.ResId;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

+import org.androidannotations.annotations.ResId;

+

/**

* <p>

* Use on {@link java.lang.Boolean} or <code>boolean</code> fields in any

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java

index 03dee4c..f72b18f 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorRes.java

@@ -15,13 +15,13 @@

*/

package org.androidannotations.annotations.res;

-import org.androidannotations.annotations.ResId;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

+import org.androidannotations.annotations.ResId;

+

/**

* <p>

* Use on {@link java.lang.Integer} or <code>int</code> fields in any enhanced

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java

index 2306529..332e161 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/ColorStateListRes.java

@@ -15,13 +15,13 @@

*/

package org.androidannotations.annotations.res;

-import org.androidannotations.annotations.ResId;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

+import org.androidannotations.annotations.ResId;

+

/**

* <p>

* Use on {@link android.content.res.ColorStateList} fields in any enhanced

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java

index fe6fda8..3ec4af1 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelOffsetRes.java

@@ -15,13 +15,13 @@

*/

package org.androidannotations.annotations.res;

-import org.androidannotations.annotations.ResId;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

+import org.androidannotations.annotations.ResId;

+

/**

* <p>

* Use on {@link java.lang.Integer} or <code>int</code> fields in any enhanced

diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java

index 0123744..d78ee23 100644

--- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java

+++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/res/DimensionPixelSizeRes.java

@@ -15,13 +15,13 @@

*/

package org.androidannotations.annotations.res;

-import org.androidannotations.annotations.ResId;

-

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;