Merge pull request androidannotations#1168 from nbelikov/1163_javadoc_for_jdk8

WonderCsabo · WonderCsabo · commit 051cdb303a5c · 2014-09-28T11:01:56.000+02:00
Fix JavaDoc compilation errors on JDK8
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java
@@ -21,17 +21,22 @@
 import java.lang.annotation.Target;
 
 /**
+ * <p>
  * When used standalone in an {@link EFragment} or in conjunction with the
  * {@link UiThread} or {@link Background} annotations, the annotated method will
  * be wrapped in an 'if attached' block such that no code will be executed if
  * the {@link EFragment} is no longer bound to its parent activity.
- * <p/>
+ * </p>
+ * <p>
  * Should be used on method that must meet the following criteria
- * <p/>
+ * </p>
+ * <p>
  * 1) Can only be used in conjunction with classes annotated with
  * {@link EFragment}
- * <p/>
+ * </p>
+ * <p>
  * 2) The annotated method MUST return void and MAY contain parameters.
+ * </p>
  *
  * <blockquote> <b>Example</b> :
  *
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Receiver.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Receiver.java
@@ -70,10 +70,10 @@
  *      &#064;Receiver(actions = {@link android.net.wifi.WifiManager#WIFI_STATE_CHANGED_ACTION}, registerAt = RegisterAt.OnResumeOnPause)
  *      public void onWifiStateChangedWithoutIntent();
  *      
- *      &#064;Receiver(actions = {@link android.Intent.ACTION_VIEW}, dataSchemes = "http")
+ *      &#064;Receiver(actions = {@link android.content.Intent#ACTION_VIEW}, dataSchemes = "http")
  *      public void onHttpUrlOpened(Intent intent);
  *      
- *      &#064;Receiver(actions = {@link android.Intent.ACTION_VIEW}, dataSchemes = {"http", "https"})
+ *      &#064;Receiver(actions = {@link android.content.Intent#ACTION_VIEW}, dataSchemes = {"http", "https"})
  *      public void onHttpOrHttpsUrlOpened(Intent intent);
  * 
  * }
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
@@ -23,12 +23,13 @@
 import java.lang.annotation.Target;
 
 /**
+ * <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).
- * <p/>
+ * </p>
  * <blockquote> <b>Example</b> :
- * <p/>
+ *
  * <pre>
  * &#064;EBean
  * public class MyBean {
@@ -46,7 +47,6 @@
  *
  * }
  * </pre>
- * <p/>
  * </blockquote>
  *
  * @see BackgroundExecutor#setWrongThreadListener(BackgroundExecutor.WrongThreadListener)
@@ -58,7 +58,8 @@
 public @interface SupposeBackground {
 
 	/**
-	 * 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...)
 	 */
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WakeLock.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WakeLock.java
@@ -29,7 +29,7 @@
  * </p>
  * <p>
  * <b>NOTE</b>: To use WakeLocks you need the
- * {@link android.permission.WAKE_LOCK} permission.
+ * <i>android.permission.WAKE_LOCK</i> permission.
  * </p>
  * 
  * <b>Example</b>:
@@ -62,34 +62,34 @@
 
 	public enum Level {
 		/**
-		 * @see android.os.PowerManager.FULL_WAKE_LOCK
+		 * @see android.os.PowerManager#FULL_WAKE_LOCK
 		 */
 		FULL_WAKE_LOCK,
 
 		/**
-		 * @see android.os.PowerManager.PARTIAL_WAKE_LOCK
+		 * @see android.os.PowerManager#PARTIAL_WAKE_LOCK
 		 */
 		PARTIAL_WAKE_LOCK,
 
 		/**
-		 * @see android.os.PowerManager.SCREEN_BRIGHT_WAKE_LOCK
+		 * @see android.os.PowerManager#SCREEN_BRIGHT_WAKE_LOCK
 		 */
 		SCREEN_BRIGHT_WAKE_LOCK,
 
 		/**
-		 * @see android.os.PowerManager.SCREEN_DIM_WAKE_LOCK
+		 * @see android.os.PowerManager#SCREEN_DIM_WAKE_LOCK
 		 */
 		SCREEN_DIM_WAKE_LOCK;
 	}
 
 	public enum Flag {
 		/**
-		 * @see android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP
+		 * @see android.os.PowerManager#ACQUIRE_CAUSES_WAKEUP
 		 */
 		ACQUIRE_CAUSES_WAKEUP,
 
 		/**
-		 * @see android.os.PowerManager.ON_AFTER_RELEASE
+		 * @see android.os.PowerManager#ON_AFTER_RELEASE
 		 */
 		ON_AFTER_RELEASE
 	}
diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultStringSet.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultStringSet.java
@@ -23,15 +23,19 @@
 import org.androidannotations.annotations.ResId;
 
 /**
+ * <p>
  * Use on methods in {@link SharedPref} annotated class. The generated method
  * will return an empty {@link java.util.Set} of Strings by default.
- * <p/>
+ * </p>
+ * <p>
  * The key of the preference will be the method name by default. This can be
  * overridden by specifying a string resource with the {@link #keyRes()}
  * parameter.
- * <p/>
+ * </p>
+ * <p>
  * <b>Implementation note:</b>
- * <p/>
+ * </p>
+ * <p>
  * Since {@code SharedPreferences.getStringSet} is only available from API 11,
  * the generated method serializes the {@code Set<String>} into a {@code String}
  * , and persists it with
@@ -40,6 +44,7 @@
  * From API 11 and up, the generated method simply uses the native
  * {@link android.content.SharedPreferences SharedPreferences}
  * {@code Set<String>} methods.
+ * </p>
  */
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.METHOD)

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,10 @@`
`70`	`70`	`* @Receiver(actions = {@link android.net.wifi.WifiManager#WIFI_STATE_CHANGED_ACTION}, registerAt = RegisterAt.OnResumeOnPause)`
`71`	`71`	`* public void onWifiStateChangedWithoutIntent();`
`72`	`72`	`*`
`73`		`- * @Receiver(actions = {@link android.Intent.ACTION_VIEW}, dataSchemes = "http")`
	`73`	`+ * @Receiver(actions = {@link android.content.Intent#ACTION_VIEW}, dataSchemes = "http")`
`74`	`74`	`* public void onHttpUrlOpened(Intent intent);`
`75`	`75`	`*`
`76`		`- * @Receiver(actions = {@link android.Intent.ACTION_VIEW}, dataSchemes = {"http", "https"})`
	`76`	`+ * @Receiver(actions = {@link android.content.Intent#ACTION_VIEW}, dataSchemes = {"http", "https"})`
`77`	`77`	`* public void onHttpOrHttpsUrlOpened(Intent intent);`
`78`	`78`	`*`
`79`	`79`	`* }`