diff --git a/README.markdown b/README.markdown index 4778535..6b6c7e2 100644 --- a/README.markdown +++ b/README.markdown @@ -44,7 +44,7 @@ You only need to perform this step when Google releases a new platform version o Update your SDK files to the latest version like so: $ android update sdk --no-ui - + It's important that you repeat this command until you see the message "There is nothing to install or update." That's because the tools update themselves, so it may take several iterations of this command until everything is fully updated. diff --git a/default.properties b/default.properties index 72fc4ef..2d75287 100755 --- a/default.properties +++ b/default.properties @@ -1,8 +1,8 @@ # This file is automatically generated by Android Tools. # Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# +# # This file must be checked in Version Control Systems. -# +# # To customize properties used by the Ant build system use, # "build.properties", and override values to adapt the script to your # project structure. diff --git a/pom.xml b/pom.xml index ce7b455..b98cc7a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 1.0-SNAPSHOT A utility library for your daily Android needs. http://github.com/kaeppler/droid-fu - + mk @@ -50,13 +50,13 @@ jar - + - + package - + - + org.apache.maven.plugins @@ -66,7 +66,7 @@ 1.5 - + org.apache.maven.plugins @@ -77,12 +77,12 @@ **/*.apk **/*.dex **/*.ap_ - + - + - @@ -175,7 +175,7 @@ http://github.com/kaeppler/droid-fu/downloads - + copy-jar @@ -201,11 +201,11 @@ - + - + release-sign-artifacts diff --git a/src/main/java/com/github/droidfu/activities/BetterActivity.java b/src/main/java/com/github/droidfu/activities/BetterActivity.java index 7fe4df7..3b86f31 100755 --- a/src/main/java/com/github/droidfu/activities/BetterActivity.java +++ b/src/main/java/com/github/droidfu/activities/BetterActivity.java @@ -55,7 +55,7 @@ public interface BetterActivity { * Activity of your own application, or by an Activity of an entirely * different application. This function only returns true, if your Activity * is being paused by an Activity of another app, thus hiding yours. - * + * * @return true, if the Activity is being paused because an Activity of * another application received focus. */ @@ -68,7 +68,7 @@ public interface BetterActivity { * returned. Otherwise the returned Intent is the intent returned by * getIntent (which is the Intent which was used to initially launch this * activity). - * + * * @return the current {@link Intent} */ public Intent getCurrentIntent(); @@ -104,7 +104,7 @@ public AlertDialog newYesNoDialog(int titleResourceId, int messageResourceId, * email * *

- * + * * @param titleResourceId * the string resource that should be used as the dialog title * @param error @@ -134,7 +134,7 @@ public AlertDialog newYesNoDialog(int titleResourceId, int messageResourceId, * email * *

- * + * * @param error * the exception that should be displayed and/or reported * @return the dialog @@ -144,7 +144,7 @@ public AlertDialog newYesNoDialog(int titleResourceId, int messageResourceId, /** * Creates a new list style dialog from a list of objects. The toString() * method of any such object will be used to generate the list item's label. - * + * * @param * the type of the list items * @param dialogTitle diff --git a/src/main/java/com/github/droidfu/activities/BetterActivityHelper.java b/src/main/java/com/github/droidfu/activities/BetterActivityHelper.java index cea140c..4098199 100755 --- a/src/main/java/com/github/droidfu/activities/BetterActivityHelper.java +++ b/src/main/java/com/github/droidfu/activities/BetterActivityHelper.java @@ -67,7 +67,7 @@ public static int getWindowFeatures(Activity activity) { /** * Creates a new ProgressDialog - * + * * @param activity * @param progressDialogTitleId * The resource id for the title. If this is less than or equal to 0, a default title @@ -102,7 +102,7 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) { /** * Creates a new Yes/No AlertDialog - * + * * @param context * @param dialogTitle * @param screenMessage @@ -126,7 +126,7 @@ public static AlertDialog newYesNoDialog(final Context context, String dialogTit /** * Creates a new AlertDialog to display a simple message - * + * * @param context * @param dialogTitle * @param screenMessage @@ -157,7 +157,7 @@ public void onClick(DialogInterface dialog, int which) { * droidfu_error_report_email_address - The email address the exception is sent to. * droidfu_error_report_email_subject - The subject of the email. * droidfu_dialog_button_send_error_report - The text on the Send Email button. - * + * * @param activity * @param dialogTitle * @param error @@ -214,7 +214,7 @@ public void onClick(DialogInterface dialog, int which) { /** * Creates a AlertDialog that shows a list of elements. The listener's onClick method gets * called when the user taps a list item. - * + * * @param * The type of each element * @param context @@ -262,7 +262,7 @@ public void onClick(DialogInterface dialog, int which) { /** * Checks if the application is in the background (i.e behind another application's Activity). - * + * * @param context * @return true if another application is above this one. */ @@ -284,7 +284,7 @@ public static boolean isApplicationBroughtToBackground(final Context context) { * {@link DroidFuApplication#onClose()} life-cycle handler. Application close is being defined * as the transition of the last running Activity of the current application to the Android home * screen using the BACK button. - * + * * @param context * the current context * @param keyCode diff --git a/src/main/java/com/github/droidfu/activities/BetterMapActivity.java b/src/main/java/com/github/droidfu/activities/BetterMapActivity.java index 0393e1e..f2443bc 100644 --- a/src/main/java/com/github/droidfu/activities/BetterMapActivity.java +++ b/src/main/java/com/github/droidfu/activities/BetterMapActivity.java @@ -23,27 +23,27 @@ import com.google.android.maps.MyLocationOverlay; public class BetterMapActivity extends MapActivity implements BetterActivity { - + private boolean wasCreated, wasInterrupted; - + private int progressDialogTitleId; private int progressDialogMsgId; - + private Intent currentIntent; - + private MyLocationOverlay myLocationOverlay; - + private GestureDetector tapDetector; private OnTouchListener tapListener; private MapView mapView; - + @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); - + this.wasCreated = true; this.currentIntent = getIntent(); @@ -52,32 +52,32 @@ protected void onCreate(Bundle icicle) { ((DroidFuApplication) application).setActiveContext(getClass().getCanonicalName(), this); } } - + @Override protected void onPause() { super.onPause(); wasCreated = wasInterrupted = false; - + if (myLocationOverlay != null) { myLocationOverlay.disableMyLocation(); } } - + @Override protected void onResume() { super.onResume(); - + if (myLocationOverlay != null) { myLocationOverlay.enableMyLocation(); } } - + @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); wasInterrupted = true; } - + @Override public void onNewIntent(Intent intent) { super.onNewIntent(intent); @@ -151,7 +151,7 @@ public Dialog newListDialog(String title, List elements, boolean closeOnSelect) { return BetterActivityHelper.newListDialog(this, title, elements, listener, closeOnSelect); } - + @Override protected Dialog onCreateDialog(int id) { return BetterActivityHelper.createProgressDialog(this, progressDialogTitleId, @@ -165,14 +165,14 @@ public void setProgressDialogTitleId(int progressDialogTitleId) { public void setProgressDialogMsgId(int progressDialogMsgId) { this.progressDialogMsgId = progressDialogMsgId; } - + public void setMapView(int mapLayoutId) { this.mapView = (MapView) findViewById(mapLayoutId); } - + public void setMapViewWithZoom(int mapLayoutId, int zoomControlsLayoutId) { this.mapView = (MapView) findViewById(mapLayoutId); - + ZoomControls zoomControls = (ZoomControls) findViewById(zoomControlsLayoutId); zoomControls.setOnZoomInClickListener(new View.OnClickListener() { public void onClick(View v) { @@ -186,23 +186,23 @@ public void onClick(View v) { } }); } - + public MapView getMapView() { return mapView; } - + public void setMyLocationOverlay(MyLocationOverlay myLocationOverlay) { // Create the overlay and add it to the map. this.myLocationOverlay = myLocationOverlay; mapView.getOverlays().add(this.myLocationOverlay); } - + public MyLocationOverlay getMyLocationOverlay() { return myLocationOverlay; } - + protected void setMapGestureListener(MapGestureListener mapGestureListener) { - // Map gesture listener. Our default implementation handles a double tap action + // Map gesture listener. Our default implementation handles a double tap action // as a zoom in. tapDetector = new GestureDetector(mapGestureListener); tapListener = new View.OnTouchListener() { diff --git a/src/main/java/com/github/droidfu/adapters/WebGalleryAdapter.java b/src/main/java/com/github/droidfu/adapters/WebGalleryAdapter.java index a1431c0..b1795a0 100755 --- a/src/main/java/com/github/droidfu/adapters/WebGalleryAdapter.java +++ b/src/main/java/com/github/droidfu/adapters/WebGalleryAdapter.java @@ -32,7 +32,7 @@ /** * Can be used as an adapter for an Android {@link Gallery} view. This adapter loads the images to * be shown from the web. - * + * * @author Matthias Kaeppler */ public class WebGalleryAdapter extends BaseAdapter { diff --git a/src/main/java/com/github/droidfu/cachefu/AbstractCache.java b/src/main/java/com/github/droidfu/cachefu/AbstractCache.java index 9c41248..74ffe4d 100755 --- a/src/main/java/com/github/droidfu/cachefu/AbstractCache.java +++ b/src/main/java/com/github/droidfu/cachefu/AbstractCache.java @@ -50,7 +50,7 @@ * Pushes to the cache are always write-through (i.e. the data will be stored both on disk, if disk * caching is enabled, and in memory). *

- * + * * @author Matthias Kaeppler */ public abstract class AbstractCache implements Map { @@ -67,12 +67,12 @@ public abstract class AbstractCache implements Map { private ConcurrentMap cache; private String name; - + private long expirationInMinutes; /** * Creates a new cache instance. - * + * * @param name * a human readable identifier for this cache. Note that this value will be used to * derive a directory name if the disk cache is enabled, so don't get too creative @@ -90,7 +90,7 @@ public AbstractCache(String name, int initialCapacity, long expirationInMinutes, this.name = name; this.expirationInMinutes = expirationInMinutes; - + MapMaker mapMaker = new MapMaker(); mapMaker.initialCapacity(initialCapacity); mapMaker.expiration(expirationInMinutes * 60, TimeUnit.SECONDS); @@ -112,7 +112,7 @@ private void sanitizeDiskCache() { long lastModified = f.lastModified(); Date now = new Date(); long ageInMinutes = ((now.getTime() - lastModified) / (1000*60)); - + if (ageInMinutes >= expirationInMinutes) { Log.d(name, "DISK cache expiration for file " + f.toString()); f.delete(); @@ -122,7 +122,7 @@ private void sanitizeDiskCache() { /** * Enable caching to the phone's internal storage or SD card. - * + * * @param context * the current context * @param storageDevice @@ -182,7 +182,7 @@ private void setRootDir(String rootDir) { /** * Only meaningful if disk caching is enabled. See {@link #enableDiskCache}. - * + * * @return the full absolute path to the directory where files are cached, if the disk cache is * enabled, otherwise null */ @@ -194,7 +194,7 @@ public String getDiskCacheDirectory() { * Only meaningful if disk caching is enabled. See {@link #enableDiskCache}. Turns a cache key * into the file name that will be used to persist the value to disk. Subclasses must implement * this. - * + * * @param key * the cache key * @return the file name @@ -204,7 +204,7 @@ public String getDiskCacheDirectory() { /** * Only meaningful if disk caching is enabled. See {@link #enableDiskCache}. Restores a value * previously persisted to the disk cache. - * + * * @param file * the file holding the cached value * @return the cached value @@ -215,7 +215,7 @@ public String getDiskCacheDirectory() { /** * Only meaningful if disk caching is enabled. See {@link #enableDiskCache}. Persists a value to * the disk cache. - * + * * @param ostream * the file output stream (buffered). * @param value @@ -246,7 +246,7 @@ private File getFileForKey(KeyT key) { /** * Reads a value from the cache by probing the in-memory cache, and if enabled and the in-memory * probe was a miss, the disk cache. - * + * * @param elementKey * the cache key * @return the cached value, or null if element was not cached @@ -268,13 +268,13 @@ public synchronized ValT get(Object elementKey) { long lastModified = file.lastModified(); Date now = new Date(); long ageInMinutes = ((now.getTime() - lastModified) / (1000*60)); - + if (ageInMinutes >= expirationInMinutes) { Log.d(name, "DISK cache expiration for file " + file.toString()); file.delete(); return null; } - + // disk hit Log.d(name, "DISK cache hit for " + key.toString()); try { @@ -314,7 +314,7 @@ public synchronized void putAll(Map t) { /** * Checks if a value is present in the cache. If the disk cached is enabled, this will also * check whether the value has been persisted to disk. - * + * * @param key * the cache key * @return true if the value is cached in memory or on disk, false otherwise @@ -326,7 +326,7 @@ public synchronized boolean containsKey(Object key) { /** * Checks if a value is present in the in-memory cache. This method ignores the disk cache. - * + * * @param key * the cache key * @return true if the value is currently hold in memory, false otherwise @@ -382,7 +382,7 @@ public boolean isDiskCacheEnabled() { } /** - * + * * @param rootDir * a folder name to enable caching or null to disable it. */ diff --git a/src/main/java/com/github/droidfu/cachefu/CachedList.java b/src/main/java/com/github/droidfu/cachefu/CachedList.java index 0028598..daa06d2 100644 --- a/src/main/java/com/github/droidfu/cachefu/CachedList.java +++ b/src/main/java/com/github/droidfu/cachefu/CachedList.java @@ -8,17 +8,17 @@ /** * Superclass of all list objects to be stored in {@link ModelCache}. - * + * * Operates just as standard cached object, and contains an array list of objects. - * + * * Must be initialized with the class of the objects stored, as this is used in * parcelling/unparcelling. - * + * * In order to ensure thread-safe use of list (such as iteration), use the {@link #getList()} * method, creating a copy of the list in its current state. - * + * * @author michaelengland - * + * * @param * Type of cached models to be stored in list */ @@ -36,7 +36,7 @@ public class CachedList extends CachedModel { /** * Simple parameter-less constructor. Must also have parameter-less constructor in * subclasses in order for parceling to work. - * + * * Do not use this constructor when creating a list, use one setting class instead. */ public CachedList() { @@ -46,7 +46,7 @@ public CachedList() { /** * Constructor setting variables from parcel. Same as using a blank constructor and calling * readFromParcel. - * + * * @param source * Parcel to be read from. * @throws IOException @@ -57,7 +57,7 @@ public CachedList(Parcel source) throws IOException { /** * Constructor initializing class of objects stored. - * + * * @param clazz * Required for parcelling and unparcelling of list */ @@ -68,7 +68,7 @@ public CachedList(Class clazz) { /** * Constructor initializing class of objects stored as well as initial length of list. - * + * * @param clazz * Required for parcelling and unparcelling of list * @param initialLength @@ -81,7 +81,7 @@ public CachedList(Class clazz, int initialLength) { /** * Constructor initializing class of objects stored as well as id used in key generation. - * + * * @param clazz * Required for parcelling and unparcelling of list * @param id @@ -96,7 +96,7 @@ public CachedList(Class clazz, String id) { /** * Synchronized method to get a copy of the list in its current state. This should be used when * iterating over the list in order to avoid thread-unsafe operations. - * + * * @return Copy of list in its current state */ public synchronized ArrayList getList() { @@ -105,7 +105,7 @@ public synchronized ArrayList getList() { /** * Synchronized method used to append an object to the list. - * + * * @param cachedObject * Object to add to list */ @@ -115,7 +115,7 @@ public synchronized void add(CO cachedObject) { /** * Synchronized method used to set an object at a location in the list. - * + * * @param index * Index of item to set * @param cachedObject @@ -127,7 +127,7 @@ public synchronized void set(int index, CO cachedObject) { /** * Synchronized method used to get an object from the live list. - * + * * @param index * Index of item in list * @return Item in list @@ -138,7 +138,7 @@ public synchronized CO get(int index) { /** * Synchronized method used to return size of list. - * + * * @return Size of list */ public synchronized int size() { diff --git a/src/main/java/com/github/droidfu/cachefu/CachedModel.java b/src/main/java/com/github/droidfu/cachefu/CachedModel.java index b96a0ee..0536efb 100644 --- a/src/main/java/com/github/droidfu/cachefu/CachedModel.java +++ b/src/main/java/com/github/droidfu/cachefu/CachedModel.java @@ -7,13 +7,13 @@ /** * Superclass of all objects to be stored in {@link ModelCache}. - * + * * To save an object to the cache use {@link #save(ModelCache)}, when updating an object with any * new data use {@link #reload(ModelCache)}, and when wanting to find an object from the cache, use * {@link #find(ModelCache, String, Class)}. - * + * * @author michaelengland - * + * */ public abstract class CachedModel implements Parcelable { @@ -30,7 +30,7 @@ public CachedModel() { /** * Constructor setting variables from parcel. Same as using a blank constructor and calling * readFromParcel. - * + * * @param source * Parcel to be read from. * @throws IOException @@ -41,7 +41,7 @@ public CachedModel(Parcel source) throws IOException { /** * Constructor setting ID given. - * + * * @param id * ID of new object (used when generating cache key). */ @@ -51,7 +51,7 @@ public CachedModel(String id) { /** * Returns ID of object used in key generation. - * + * * @return ID of new object (used when generating cache key). */ public String getId() { @@ -60,7 +60,7 @@ public String getId() { /** * Set ID of object used in key generation. - * + * * @param id * ID of new object (used when generating cache key). */ @@ -85,7 +85,7 @@ public String getKey() { /** * Method for looking up object in cache. - * + * * @param modelCache * Cache to be searched. * @param id @@ -118,9 +118,9 @@ public static CachedModel find(ModelCache modelCache, String id, /** * Attempts to store the object in the cache using this object's key. Generally this is the * required used. - * + * * Overwritten when saving subclasses over the top of separate superclass cache stores. e.g.: - * + * *
      * {@code
      * public boolean save(ModelCache modelCache) {
@@ -128,7 +128,7 @@ public static CachedModel find(ModelCache modelCache, String id,
      * }
      * }
      * 
- * + * * @param modelCache * Cache to save to. * @return Whether or not saving to the cache was successful. @@ -140,7 +140,7 @@ public boolean save(ModelCache modelCache) { /** * Attempts to save the object in the cache using a given key. Generally only used for saving * subclasses over the top of separate superclass cache stores. - * + * * @param modelCache * Cache to save to. * @param saveKey @@ -158,7 +158,7 @@ protected boolean save(ModelCache modelCache, String saveKey) { /** * Attempts to reload any new data from cache. - * + * * @param modelCache * Cache to be reloaded from. * @return Whether or not newer data was found in the cache. @@ -181,7 +181,7 @@ public boolean reload(ModelCache modelCache) { /** * Method called to determine a key in the cache using the object's id e.g.: - * + * *
      * {@code
      * public String createKey(String id) {
@@ -189,7 +189,7 @@ public boolean reload(ModelCache modelCache) {
      * }
      * }
      * 
- * + * * @param id * ID of object to be stored. * @return Key that object with given ID should be stored in cache under. @@ -198,7 +198,7 @@ public boolean reload(ModelCache modelCache) { /** * Method called to reload any data from a more recently stored object e.g.: - * + * *
      * {@code
      * public boolean reloadFromCachedModel(ModelCache modelCache, CachedModel cachedModel) {
@@ -208,9 +208,9 @@ public boolean reload(ModelCache modelCache) {
      * }
      * }
      * 
- * + * * Can also be used to reload internal cached objects. e.g.: - * + * *
      * {@code
      * public boolean reloadFromCachedModel(ModelCache modelCache, CachedModel cachedModel) {
@@ -220,7 +220,7 @@ public boolean reload(ModelCache modelCache) {
      * }
      * }
      * 
- * + * * @param modelCache * Cache that is currently being reloaded from. * @param cachedModel @@ -249,7 +249,7 @@ public void writeToParcel(Parcel dest, int flags) { /** * Saves data to parcel. - * + * * @param source * Parcel to save to. * @throws IOException diff --git a/src/main/java/com/github/droidfu/cachefu/HttpResponseCache.java b/src/main/java/com/github/droidfu/cachefu/HttpResponseCache.java index 68ae395..96f0ca6 100644 --- a/src/main/java/com/github/droidfu/cachefu/HttpResponseCache.java +++ b/src/main/java/com/github/droidfu/cachefu/HttpResponseCache.java @@ -13,9 +13,9 @@ * Allows caching HTTP responses (only status code and payload at the moment) using the features * provided by {@link AbstractCache}. The key into the cache will be the request URL used to * retrieve the HTTP response in the first place. - * + * * @author Matthias Kaeppler - * + * */ public class HttpResponseCache extends AbstractCache { diff --git a/src/main/java/com/github/droidfu/cachefu/ImageCache.java b/src/main/java/com/github/droidfu/cachefu/ImageCache.java index 4a2f641..a9369eb 100755 --- a/src/main/java/com/github/droidfu/cachefu/ImageCache.java +++ b/src/main/java/com/github/droidfu/cachefu/ImageCache.java @@ -28,9 +28,9 @@ /** * Implements a cache capable of caching image files. It exposes helper methods to immediately * access binary image data as {@link Bitmap} objects. - * + * * @author Matthias Kaeppler - * + * */ public class ImageCache extends AbstractCache { diff --git a/src/main/java/com/github/droidfu/cachefu/ModelCache.java b/src/main/java/com/github/droidfu/cachefu/ModelCache.java index e7beec7..3b29839 100644 --- a/src/main/java/com/github/droidfu/cachefu/ModelCache.java +++ b/src/main/java/com/github/droidfu/cachefu/ModelCache.java @@ -13,15 +13,15 @@ * Allows caching Model objects using the features provided by {@link AbstractCache}. The key into * the cache will be based around the cached object's key, and the object will be able to save and * reload itself from the cache. - * + * * @author Michael England - * + * */ public class ModelCache extends AbstractCache { /** * Creates an {@link AbstractCache} with params provided and name 'ModelCache'. - * + * * @see com.github.droidfu.cachefu.AbstractCache#AbstractCache(java.lang.String, int, long, int) */ public ModelCache(int initialCapacity, long expirationInMinutes, int maxConcurrentThreads) { @@ -43,7 +43,7 @@ public synchronized CachedModel put(String key, CachedModel value) { /** * Removes all cached objects with key prefix. - * + * * @param prefix * Prefix of all cached object keys to be removed */ diff --git a/src/main/java/com/github/droidfu/http/BetterHttp.java b/src/main/java/com/github/droidfu/http/BetterHttp.java index 2d23b0a..4a799a2 100644 --- a/src/main/java/com/github/droidfu/http/BetterHttp.java +++ b/src/main/java/com/github/droidfu/http/BetterHttp.java @@ -94,7 +94,7 @@ public static void setupHttpClient() { * Enables caching of HTTP responses. This will only enable the in-memory cache. If you also * want to enable the disk cache, see {@link #enableResponseCache(Context, int, long, int, int)} * . - * + * * @param initialCapacity * the initial element size of the cache * @param expirationInMinutes @@ -123,7 +123,7 @@ public static void enableGZIPEncoding() { /** * Enables caching of HTTP responses. This will also enable the disk cache. - * + * * @param context * the current context * @param initialCapacity @@ -232,7 +232,7 @@ public static void setMaximumConnections(int maxConnections) { /** * Adjust the socket timeout, i.e. the amount of time that may pass when waiting for a server * response. Time unit is milliseconds. - * + * * @param socketTimeout * the timeout in milliseconds */ diff --git a/src/main/java/com/github/droidfu/http/BetterHttpRequest.java b/src/main/java/com/github/droidfu/http/BetterHttpRequest.java index 4e3e4f2..16d7330 100644 --- a/src/main/java/com/github/droidfu/http/BetterHttpRequest.java +++ b/src/main/java/com/github/droidfu/http/BetterHttpRequest.java @@ -41,7 +41,7 @@ public interface BetterHttpRequest { * where it is common to serve error stati that indicate a failure in the application logic * (e.g. 404 if a resource doesn't exist). You typically don't want to treat those as connection * errors, but gracefully handle them like a normal success code. - * + * * @param statusCodes * the set of status codes that you want to manually handle as part of the response * @return this request @@ -50,7 +50,7 @@ public interface BetterHttpRequest { /** * Set maximum number of retries for this particular request. - * + * * @param retries * the maximum number of retries should the request fail * @return this request @@ -59,7 +59,7 @@ public interface BetterHttpRequest { /** * Set the socket timeout for this specific request. - * + * * @param timeout * the timeout in milliseconds * @return this request diff --git a/src/main/java/com/github/droidfu/http/CachedHttpResponse.java b/src/main/java/com/github/droidfu/http/CachedHttpResponse.java index 09b449a..264b16c 100644 --- a/src/main/java/com/github/droidfu/http/CachedHttpResponse.java +++ b/src/main/java/com/github/droidfu/http/CachedHttpResponse.java @@ -10,7 +10,7 @@ /** * A response proxy returning data from a {@link HttpResponseCache} - * + * * @author Matthias Kaeppler */ public class CachedHttpResponse implements BetterHttpResponse { diff --git a/src/main/java/com/github/droidfu/imageloader/ImageLoader.java b/src/main/java/com/github/droidfu/imageloader/ImageLoader.java index 901d4ca..8bbdf7f 100755 --- a/src/main/java/com/github/droidfu/imageloader/ImageLoader.java +++ b/src/main/java/com/github/droidfu/imageloader/ImageLoader.java @@ -41,7 +41,7 @@ * is present in the cache, it is set immediately on the given view. Otherwise, a thread from a * thread pool will be used to download the image in the background and set the image on the view as * soon as it completes. - * + * * @author Matthias Kaeppler */ public class ImageLoader implements Runnable { @@ -64,7 +64,7 @@ public class ImageLoader implements Runnable { private static int numRetries = DEFAULT_NUM_RETRIES; private static long expirationInMinutes = DEFAULT_TTL_MINUTES; - + /** * @param numThreads * the maximum number of threads that will be started to download images in parallel @@ -87,7 +87,7 @@ public static void setMaxDownloadAttempts(int numAttempts) { * when using ImageLoader as part of {@link WebImageView} or {@link WebGalleryAdapter}, then * there is no need to call this method, since those classes will already do that for you. This * method is idempotent. You may call it multiple times without any side effects. - * + * * @param context * the current context */ @@ -106,7 +106,7 @@ public static synchronized void initialize(Context context, long expirationInMin initialize(context); } - + private String imageUrl; private ImageLoaderHandler handler; @@ -120,7 +120,7 @@ private ImageLoader(String imageUrl, ImageLoaderHandler handler) { * Triggers the image loader for the given image and view. The image loading will be performed * concurrently to the UI main thread, using a fixed size thread pool. The loaded image will be * posted back to the given ImageView upon completion. - * + * * @param imageUrl * the URL of the image to download * @param imageView @@ -135,7 +135,7 @@ public static void start(String imageUrl, ImageView imageView) { * for the download to finish. The image loading will be performed concurrently to the UI main * thread, using a fixed size thread pool. The loaded image will be posted back to the given * ImageView upon completion. - * + * * @param imageUrl * the URL of the image to download * @param imageView @@ -158,7 +158,7 @@ public static void start(String imageUrl, ImageView imageView, Drawable dummyDra * image will not be automatically posted to an ImageView; instead, you can pass a custom * {@link ImageLoaderHandler} and handle the loaded image yourself (e.g. cache it for later * use). - * + * * @param imageUrl * the URL of the image to download * @param handler @@ -174,7 +174,7 @@ public static void start(String imageUrl, ImageLoaderHandler handler) { * image will not be automatically posted to an ImageView; instead, you can pass a custom * {@link ImageLoaderHandler} and handle the loaded image yourself (e.g. cache it for later * use). - * + * * @param imageUrl * the URL of the image to download * @param handler @@ -228,7 +228,7 @@ public static void clearCache() { /** * Returns the image cache backing this image loader. - * + * * @return the {@link ImageCache} */ public static ImageCache getImageCache() { diff --git a/src/main/java/com/github/droidfu/imageloader/ImageLoaderHandler.java b/src/main/java/com/github/droidfu/imageloader/ImageLoaderHandler.java index 8e59a32..ee51891 100755 --- a/src/main/java/com/github/droidfu/imageloader/ImageLoaderHandler.java +++ b/src/main/java/com/github/droidfu/imageloader/ImageLoaderHandler.java @@ -56,7 +56,7 @@ protected final void handleImageLoadedMessage(Message msg) { /** * Override this method if you need custom handler logic. Note that this method can actually be * called directly for performance reasons, in which case the message will be null - * + * * @param bitmap * the bitmap returned from the image loader * @param msg diff --git a/src/main/java/com/github/droidfu/support/ArraySupport.java b/src/main/java/com/github/droidfu/support/ArraySupport.java index 9f5eb9e..cdf5d13 100644 --- a/src/main/java/com/github/droidfu/support/ArraySupport.java +++ b/src/main/java/com/github/droidfu/support/ArraySupport.java @@ -40,7 +40,7 @@ public static T[] delete(T[] array, int index) { /** * Attempts to find an object in a potentially unsorted array. Complexity is * O(N). - * + * * @param * @param array * the input array diff --git a/src/main/java/com/github/droidfu/support/DiagnosticSupport.java b/src/main/java/com/github/droidfu/support/DiagnosticSupport.java index bd06b76..fa89c10 100644 --- a/src/main/java/com/github/droidfu/support/DiagnosticSupport.java +++ b/src/main/java/com/github/droidfu/support/DiagnosticSupport.java @@ -47,7 +47,7 @@ public class DiagnosticSupport { * Returns the ANDROID_ID unique device ID for the current device. Reading that ID has changed * between platform versions, so this method takes care of attempting to read it in different * ways, if one failed. - * + * * @param context * the context * @return the device's ANDROID_ID, or null if it could not be determined @@ -65,7 +65,7 @@ public static String getAndroidId(Context context) { /** * Same as {@link #getAndroidId(Context)}, but never returns null. - * + * * @param context * the context * @param fallbackValue diff --git a/src/main/java/com/github/droidfu/support/IntentSupport.java b/src/main/java/com/github/droidfu/support/IntentSupport.java index 59fd548..2ee5da7 100644 --- a/src/main/java/com/github/droidfu/support/IntentSupport.java +++ b/src/main/java/com/github/droidfu/support/IntentSupport.java @@ -34,7 +34,7 @@ public class IntentSupport { /** * Checks whether there are applications installed which are able to handle the given * action/data. - * + * * @param context * the current context * @param action @@ -58,7 +58,7 @@ public static boolean isIntentAvailable(Context context, String action, Uri uri, /** * Checks whether there are applications installed which are able to handle the given * action/type. - * + * * @param context * the current context * @param action @@ -79,7 +79,7 @@ public static boolean isIntentAvailable(Context context, String action, String m /** * Checks whether there are applications installed which are able to handle the given intent. - * + * * @param context * the current context * @param intent @@ -129,7 +129,7 @@ public static Intent newMapsIntent(String address, String placeTitle) { /** * Creates an intent which when fired, will launch the camera to take a picture that's saved to * a temporary file so you can use it directly without going through the gallery. - * + * * @param tempFile * the file that should be used to temporarily store the picture * @return the intent @@ -143,7 +143,7 @@ public static Intent newTakePictureIntent(File tempFile) { /** * Creates an intent which when fired, will launch the phone's picture gallery to select a * picture from it. - * + * * @return the intent */ public static Intent newSelectPictureIntent() { @@ -156,7 +156,7 @@ public static Intent newSelectPictureIntent() { * Creates an intent that will open the phone app and enter the given number. Unlike * {@link #newCallNumberIntent(String)}, this does not actually dispatch the call, so it gives * the user a chance to review and edit the number. - * + * * @param phoneNumber * the number to dial * @return the intent @@ -169,7 +169,7 @@ public static Intent newDialNumberIntent(String phoneNumber) { * Creates an intent that will immediately dispatch a call to the given number. NOTE that unlike * {@link #newDialNumberIntent(String)}, this intent requires the * {@link android.Manifest.permission#CALL_PHONE} permission to be set. - * + * * @param phoneNumber * the number to call * @return the intent diff --git a/src/main/java/com/github/droidfu/support/StringSupport.java b/src/main/java/com/github/droidfu/support/StringSupport.java index 3f5a29c..5c2c2b2 100644 --- a/src/main/java/com/github/droidfu/support/StringSupport.java +++ b/src/main/java/com/github/droidfu/support/StringSupport.java @@ -10,7 +10,7 @@ public class StringSupport { /** * Turns a camel case string into an underscored one, e.g. "HelloWorld" * becomes "hello_world". - * + * * @param camelCaseString * the string to underscore * @return the underscored string @@ -30,7 +30,7 @@ public static String underscore(String camelCaseString) { * token of type Character.LOWERCASE_LETTER will belong to the * following token rather than to the preceding, if any, * Character.UPPERCASE_LETTER token. - * + * *
      * StringUtils.splitByCharacterTypeCamelCase(null)         = null
      * StringUtils.splitByCharacterTypeCamelCase("")           = []
@@ -42,7 +42,7 @@ public static String underscore(String camelCaseString) {
      * StringUtils.splitByCharacterTypeCamelCase("foo200Bar")  = ["foo", "200", "Bar"]
      * StringUtils.splitByCharacterTypeCamelCase("ASFRules")   = ["ASF", "Rules"]
      * 
- * + * * @param str * the String to split, may be null * @return an array of parsed Strings, null if null String @@ -64,7 +64,7 @@ public static String[] splitByCharacterTypeCamelCase(String str) { * Character.LOWERCASE_LETTER will belong to the following * token rather than to the preceding, if any, * Character.UPPERCASE_LETTER token. - * + * * @param str * the String to split, may be null * @param camelCase diff --git a/src/main/java/com/github/droidfu/testsupport/DroidFuAssertions.java b/src/main/java/com/github/droidfu/testsupport/DroidFuAssertions.java index 587a310..2015998 100644 --- a/src/main/java/com/github/droidfu/testsupport/DroidFuAssertions.java +++ b/src/main/java/com/github/droidfu/testsupport/DroidFuAssertions.java @@ -47,7 +47,7 @@ public static void assertEqualElements(Collection expected, Collection * Asserts that two dates are equal down to the granularity of a day. This * assertion ignores the time component entirely, i.e. two dates are * considered equal even if the times of day differ. - * + * * @param expected * @param actual */ @@ -77,7 +77,7 @@ public static void assertDateEquals(Date expected, Date actual) { * Asserts that two dates are equal down to the granularity of a second. * This assertion ignores milliseconds, so two dates will be considered * equal even if their milliseconds fractions differ. - * + * * @param expected * @param actual */ diff --git a/src/main/java/com/github/droidfu/widgets/WebImageView.java b/src/main/java/com/github/droidfu/widgets/WebImageView.java index b1714db..216609b 100644 --- a/src/main/java/com/github/droidfu/widgets/WebImageView.java +++ b/src/main/java/com/github/droidfu/widgets/WebImageView.java @@ -34,7 +34,7 @@ /** * An image view that fetches its image off the web using the supplied URL. While the image is being * downloaded, a progress indicator will be shown. - * + * * @author Matthias Kaeppler */ public class WebImageView extends ViewSwitcher { @@ -200,7 +200,7 @@ public void setImageUrl(String imageUrl) { /** * Often you have resources which usually have an image, but some don't. For these cases, use * this method to supply a placeholder drawable which will be loaded instead of a web image. - * + * * @param imageResourceId * the resource of the placeholder image drawable */ diff --git a/src/main/java/com/google/common/base/Function.java b/src/main/java/com/google/common/base/Function.java index a757828..7f970a6 100644 --- a/src/main/java/com/google/common/base/Function.java +++ b/src/main/java/com/google/common/base/Function.java @@ -23,7 +23,7 @@ *

* Implementations which may cause side effects upon evaluation are strongly * encouraged to state this fact clearly in their API documentation. - * + * * @param * the type of the function input * @param @@ -37,7 +37,7 @@ public interface Function { * Applies the function to an object of type {@code F}, resulting in an * object of type {@code T}. Note that types {@code F} and {@code T} may or * may not be the same. - * + * * @param from * the source object * @return the resulting object diff --git a/src/main/java/com/google/common/base/Objects.java b/src/main/java/com/google/common/base/Objects.java index 94af81c..aeb73e2 100644 --- a/src/main/java/com/google/common/base/Objects.java +++ b/src/main/java/com/google/common/base/Objects.java @@ -15,7 +15,7 @@ /** * Helper functions that can operate on any {@code Object}. - * + * * @author Laurence Gonsalves */ public final class Objects { @@ -45,13 +45,13 @@ public static boolean equal(Object a, Object b) { * This is useful for implementing {@link Object#hashCode()}. For example, * in an object that has three properties, {@code x}, {@code y}, and {@code * z}, one could write: - * + * *

      * public int hashCode() {
      *     return Objects.hashCode(getX(), getY(), getZ());
      * }
      * 
- * + * * Warning: When a single object is supplied, the returned hash code * does not equal the hash code of that object. */ diff --git a/src/main/java/com/google/common/collect/AbstractMapEntry.java b/src/main/java/com/google/common/collect/AbstractMapEntry.java index 63da3da..eb4b117 100644 --- a/src/main/java/com/google/common/collect/AbstractMapEntry.java +++ b/src/main/java/com/google/common/collect/AbstractMapEntry.java @@ -18,7 +18,7 @@ /** * Implementation of the {@code equals}, {@code hashCode}, and {@code toString} * methods of {@code Entry}. - * + * * @author Jared Levy */ abstract class AbstractMapEntry implements Entry { diff --git a/src/main/java/com/google/common/collect/CustomConcurrentHashMap.java b/src/main/java/com/google/common/collect/CustomConcurrentHashMap.java index 9f8f36c..95594ac 100644 --- a/src/main/java/com/google/common/collect/CustomConcurrentHashMap.java +++ b/src/main/java/com/google/common/collect/CustomConcurrentHashMap.java @@ -65,7 +65,7 @@ *

* For example, the following strategy emulates the behavior of * {@link java.util.concurrent.ConcurrentHashMap}: - * + * *

  * @code
  * class ConcurrentHashMapStrategy<K, V>
@@ -108,17 +108,17 @@
  * }
  * }
  * 
- * + * * To create a {@link java.util.concurrent.ConcurrentMap} using the strategy * above: - * + * *
  * @code
  *   ConcurrentMap<K, V> map = new CustomConcurrentHashMap.Builder()
  *       .build(new ConcurrentHashMapStrategy<K, V>());
  * }
  * 
- * + * * @author Bob Lee * @author Doug Lea */ @@ -146,7 +146,7 @@ static final class Builder { * other kind of hash table is a relatively slow operation, so, when * possible, it is a good idea to provide estimates of expected table * sizes. - * + * * @throws IllegalArgumentException * if initialCapacity < 0 */ @@ -175,7 +175,7 @@ public Builder initialCapacity(int initialCapacity) { * magnitude do not usually have much noticeable impact. A value of one * is appropriate when it is known that only one thread will modify and * all others will only read. Defaults to {@literal 16}. - * + * * @throws IllegalArgumentException * if concurrencyLevel < 0 */ @@ -193,7 +193,7 @@ public Builder concurrencyLevel(int concurrencyLevel) { /** * Creates a new concurrent hash map backed by the given strategy. - * + * * @param strategy * used to implement and manipulate the entries * @param @@ -239,7 +239,7 @@ public ConcurrentMap buildMap(Strategy strategy) { * of a type other than {@code K} can result in that object being * unsafely passed to the computer function as type {@code K} not to * mention the unsafe key being stored in the map. - * + * * @param strategy * used to implement and manipulate the entries * @param computer @@ -295,7 +295,7 @@ int getConcurrencyLevel() { * example. Strategy implementations should proactively remove partially * reclaimed entries so that {@link Map#isEmpty} and {@link Map#size()} * return up-to-date results. - * + * * @param * the type of keys to be stored in the returned map * @param @@ -313,7 +313,7 @@ public interface Strategy { * whether next is null or not. For example, if next is null (as will * often be the case), this factory might use an entry class that * doesn't waste memory on an unnecessary field. - * + * * @param key * for this entry * @param hash @@ -331,7 +331,7 @@ public interface Strategy { * {@code original} to the returned entry. For example, * CustomConcurrentHashMap might use this method when removing other * entries or expanding the internal table. - * + * * @param key * for {@code original} as well as the returned entry. Explicitly * provided here to prevent reclamation of the key at an @@ -348,7 +348,7 @@ public interface Strategy { /** * Sets the value of an entry using volatile semantics. Values are set * synchronously on a per-entry basis. - * + * * @param entry * to set the value on * @param value @@ -358,7 +358,7 @@ public interface Strategy { /** * Gets the value of an entry using volatile semantics. - * + * * @param entry * to get the value from */ @@ -367,7 +367,7 @@ public interface Strategy { /** * Returns true if the two given keys are equal, false otherwise. * Neither key will be null. - * + * * @param a * key from inside the map * @param b @@ -379,7 +379,7 @@ public interface Strategy { /** * Returns true if the two given values are equal, false otherwise. * Neither value will be null. - * + * * @param a * value from inside the map * @param b @@ -390,7 +390,7 @@ public interface Strategy { /** * Returns a hash code for the given key. - * + * * @see Object#hashCode the same contractual obligations apply here */ int hashKey(Object key); @@ -398,7 +398,7 @@ public interface Strategy { /** * Gets the key for the given entry. This may return null (for example, * if the key was reclaimed by the garbage collector). - * + * * @param entry * to get key from * @return key from the given entry @@ -409,7 +409,7 @@ public interface Strategy { * Gets the next entry relative to the given entry, the exact same entry * that was provided to {@link Strategy#newEntry} when the given entry * was created. - * + * * @return the next entry or null if null was passed to * {@link Strategy#newEntry} */ @@ -434,7 +434,7 @@ public interface Strategy { * entries to this strategy. Invoked once when the map is created. * Strategies that don't need access to the map's internal entries can * simply ignore the argument. - * + * * @param internals * of the map, enables direct interaction with the internal * entries @@ -456,7 +456,7 @@ public interface Internals { /** * Returns the internal entry corresponding to the given key from the * map. - * + * * @param key * to retrieve entry for * @throws NullPointerException @@ -467,7 +467,7 @@ public interface Internals { /** * Removes the given entry from the map if the value of the entry in the * map matches the given value. - * + * * @param entry * to remove * @param value @@ -479,7 +479,7 @@ public interface Internals { /** * Removes the given entry from the map. - * + * * @param entry * to remove * @throws NullPointerException @@ -499,7 +499,7 @@ public interface Internals { * Implementations can throw {@link UnsupportedOperationException} in * {@link #setValue(Object, Object)} if they wish to prevent users from * setting values directly. - * + * * @see Builder#buildComputingMap(CustomConcurrentHashMap.ComputingStrategy, * Function) */ @@ -510,7 +510,7 @@ public interface ComputingStrategy extends Strategy { * Called as a result of {@link Map#get}. If this method throws an * exception, CustomConcurrentHashMap will remove the entry and retry * the computation on subsequent requests. - * + * * @param entry * that was created * @param computer @@ -528,7 +528,7 @@ public interface ComputingStrategy extends Strategy { * {@link #compute} if necessary. Returns null if a value isn't * available at which point CustomConcurrentHashMap tries to compute a * new value. - * + * * @param entry * to return value from * @return stored value or null if the value isn't available @@ -543,7 +543,7 @@ public interface ComputingStrategy extends Strategy { * against poor quality hash functions. This is critical when the concurrent * hash map uses power-of-two length hash tables, that otherwise encounter * collisions for hash codes that do not differ in lower or upper bits. - * + * * @param h * hash code */ @@ -706,7 +706,7 @@ Segment[] newSegmentArray(int ssize) { /** * Returns the segment that should be used for key with given hash - * + * * @param hash * the hash code for the key * @return the segment @@ -1243,7 +1243,7 @@ void clear() { /** * Returns {@code true} if this map contains no key-value mappings. - * + * * @return {@code true} if this map contains no key-value mappings */ @Override @@ -1283,7 +1283,7 @@ public boolean isEmpty() { * Returns the number of key-value mappings in this map. If the map * contains more than {@code Integer.MAX_VALUE} elements, returns * {@code Integer.MAX_VALUE}. - * + * * @return the number of key-value mappings in this map */ @Override @@ -1342,7 +1342,7 @@ public int size() { * a value {@code v} such that {@code key.equals(k)}, then this method * returns {@code v}; otherwise it returns {@code null}. (There can be * at most one such mapping.) - * + * * @throws NullPointerException * if the specified key is null */ @@ -1357,7 +1357,7 @@ public V get(Object key) { /** * Tests if the specified object is a key in this table. - * + * * @param key * possible key * @return {@code true} if and only if the specified object is a key in @@ -1380,7 +1380,7 @@ public boolean containsKey(Object key) { * specified value. Note: This method requires a full internal traversal * of the hash table, and so is much slower than method {@code * containsKey}. - * + * * @param value * value whose presence in this map is to be tested * @return {@code true} if this map maps one or more keys to the @@ -1451,7 +1451,7 @@ public boolean containsValue(Object value) { *

* The value can be retrieved by calling the {@code get} method with a * key that is equal to the original key. - * + * * @param key * key with which the specified value is to be associated * @param value @@ -1475,7 +1475,7 @@ public V put(K key, V value) { /** * {@inheritDoc} - * + * * @return the previous value associated with the specified key, or * {@code null} if there was no mapping for the key * @throws NullPointerException @@ -1496,7 +1496,7 @@ public V putIfAbsent(K key, V value) { * Copies all of the mappings from the specified map to this one. These * mappings replace any mappings that this map had for any of the keys * currently in the specified map. - * + * * @param m * mappings to be stored in this map */ @@ -1510,7 +1510,7 @@ public void putAll(Map m) { /** * Removes the key (and its corresponding value) from this map. This * method does nothing if the key is not in the map. - * + * * @param key * the key that needs to be removed * @return the previous value associated with {@code key}, or {@code @@ -1529,7 +1529,7 @@ public V remove(Object key) { /** * {@inheritDoc} - * + * * @throws NullPointerException * if the specified key is null */ @@ -1543,7 +1543,7 @@ public boolean remove(Object key, Object value) { /** * {@inheritDoc} - * + * * @throws NullPointerException * if any of the arguments are null */ @@ -1563,7 +1563,7 @@ public boolean replace(K key, V oldValue, V newValue) { /** * {@inheritDoc} - * + * * @return the previous value associated with the specified key, or * {@code null} if there was no mapping for the key * @throws NullPointerException @@ -2155,7 +2155,7 @@ public V get(Object k) { * {@link SimpleInternalEntry}. Intended to be subclassed to provide * customized behavior. For example, the following creates a map that uses * byte arrays as keys: - * + * *

      * @code
      *   return new CustomConcurrentHashMap.Builder().buildMap(
@@ -2168,7 +2168,7 @@ public V get(Object k) {
      *         }
      *       });}
      * 
- * + * * With nothing overridden, it yields map behavior equivalent to that of * {@link ConcurrentHashMap}. */ diff --git a/src/main/java/com/google/common/collect/MapMaker.java b/src/main/java/com/google/common/collect/MapMaker.java index 87231f0..6943470 100644 --- a/src/main/java/com/google/common/collect/MapMaker.java +++ b/src/main/java/com/google/common/collect/MapMaker.java @@ -36,7 +36,7 @@ * {@linkplain SoftReference soft} or {@linkplain WeakReference weak} keys, soft * or weak values, timed expiration, and on-demand computation of values. Usage * example: - * + * *
  * @code
  *   ConcurrentMap<Key, Graph> graphs = new MapMaker()
@@ -51,7 +51,7 @@
  *             }
  *           });}
  * 
- * + * * These features are all optional; {@code new MapMaker().makeMap()} returns a * valid concurrent map that behaves exactly like a {@link ConcurrentHashMap}. * The returned map is implemented as a hash table with similar performance @@ -82,7 +82,7 @@ * drop-in replacement for {@link java.util.WeakHashMap}, adding concurrency, * asynchronous cleanup, identity-based equality for keys, and great * flexibility. - * + * * @author Bob Lee * @author Kevin Bourrillion */ @@ -104,7 +104,7 @@ public MapMaker() { * Sets a custom initial capacity (defaults to 16). Resizing this or any * other kind of hash table is a relatively slow operation, so, when * possible, it is a good idea to provide estimates of expected table sizes. - * + * * @throws IllegalArgumentException * if {@code initialCapacity} is negative * @throws IllegalStateException @@ -128,7 +128,7 @@ public MapMaker initialCapacity(int initialCapacity) { * noticeable impact. A value of one is appropriate when it is known that * only one thread will modify and all others will only read. Defaults to * 16. - * + * * @throws IllegalArgumentException * if {@code concurrencyLevel} is nonpositive * @throws IllegalStateException @@ -148,7 +148,7 @@ public MapMaker concurrencyLevel(int concurrencyLevel) { * example, storing a key in the map and then attempting a lookup using a * different but {@link Object#equals(Object) equals}-equivalent key will * always fail. - * + * * @throws IllegalStateException * if the key strength was already set * @see WeakReference @@ -166,7 +166,7 @@ public MapMaker weakKeys() { * example, storing a key in the map and then attempting a lookup using a * different but {@link Object#equals(Object) equals}-equivalent key will * always fail. - * + * * @throws IllegalStateException * if the key strength was already set * @see SoftReference @@ -197,7 +197,7 @@ private MapMaker setKeyStrength(Strength strength) { * of {@link Map#containsValue(Object) containsValue}, * {@link ConcurrentMap#remove(Object, Object) remove(Object, Object)}, and * {@link ConcurrentMap#replace(Object, Object, Object) replace(K, V, V)}. - * + * * @throws IllegalStateException * if the key strength was already set * @see WeakReference @@ -219,7 +219,7 @@ public MapMaker weakValues() { * of {@link Map#containsValue(Object) containsValue}, * {@link ConcurrentMap#remove(Object, Object) remove(Object, Object)}, and * {@link ConcurrentMap#replace(Object, Object, Object) replace(K, V, V)}. - * + * * @throws IllegalStateException * if the value strength was already set * @see SoftReference @@ -241,7 +241,7 @@ private MapMaker setValueStrength(Strength strength) { /** * Specifies that each entry should be automatically removed from the map * once a fixed duration has passed since the entry's creation. - * + * * @param duration * the length of time after an entry is created that it should be * automatically removed @@ -269,7 +269,7 @@ public MapMaker expiration(long duration, TimeUnit unit) { * Builds the final map, without on-demand computation of values. This * method does not alter the state of this {@code MapMaker} instance, so it * can be invoked again to create multiple independent maps. - * + * * @param * the type of keys to be stored in the returned map * @param @@ -829,7 +829,7 @@ private interface ReferenceEntry { /** * Sets the value reference for this entry. - * + * * @param valueReference */ void setValueReference(ValueReference valueReference); diff --git a/src/test/java/com/github/droidfu/testsupport/TestDroidFuAssertions.java b/src/test/java/com/github/droidfu/testsupport/TestDroidFuAssertions.java index 1142400..46d7a7c 100644 --- a/src/test/java/com/github/droidfu/testsupport/TestDroidFuAssertions.java +++ b/src/test/java/com/github/droidfu/testsupport/TestDroidFuAssertions.java @@ -166,7 +166,7 @@ public void assertEqualTimes() { Date expected = cal.getTime(); Date actual = new Date(cal.getTime().getTime() + 50); // 50ms deviation - + DroidFuAssertions.assertTimeEquals(expected, actual); } }