formatting fixes and documentation

Author: Peter Leibiger

picasso/src/main/java/com/squareup/picasso/RequestCreator.java

@@ -330,7 +330,7 @@ public void into(Target target) {
     target.onPrepareLoad(drawable);
 
     Action action = new TargetAction(picasso, target, finalData, skipMemoryCache, errorResId,
-            errorDrawable, requestKey);
+        errorDrawable, requestKey);
     picasso.enqueueAndSubmit(action);
   }
 

picasso/src/main/java/com/squareup/picasso/Target.java

@@ -37,9 +37,21 @@ public interface Target {
    */
   void onBitmapLoaded(Bitmap bitmap, LoadedFrom from);
 
-  /** Callback indicating the image could not be successfully loaded. */
+  /**
+   * Callback indicating the image could not be successfully loaded.
+   * <p/>
+   * <strong>Note:</strong> The passed Drawable may be null if none has been specified
+   * via {@link RequestCreator#error(android.graphics.drawable.Drawable)}
+   * or {@link RequestCreator#error(int)}.
+   */
   void onBitmapFailed(Drawable errorDrawable);
 
-  /** Callback invoked right before your request is submitted. */
+  /**
+  * Callback invoked right before your request is submitted.
+  * <p/>
+  * <strong>Note:</strong> The passed Drawable may be null if none has been specified
+  * via {@link RequestCreator#placeholder(android.graphics.drawable.Drawable)}
+  * or {@link RequestCreator#placeholder(int)}.
+  */
   void onPrepareLoad(Drawable placeHolderDrawable);
 }

picasso/src/main/java/com/squareup/picasso/TargetAction.java

@@ -21,7 +21,7 @@
 final class TargetAction extends Action<Target> {
 
   TargetAction(Picasso picasso, Target target, Request data, boolean skipCache,
-               int errorResId, Drawable errorDrawable, String key) {
+        int errorResId, Drawable errorDrawable, String key) {
     super(picasso, target, data, skipCache, false, errorResId, errorDrawable, key);
   }
 
@@ -44,11 +44,8 @@ final class TargetAction extends Action<Target> {
     if (target != null) {
       if (errorResId != 0) {
         target.onBitmapFailed(picasso.context.getResources().getDrawable(errorResId));
-      } else if (errorDrawable != null) {
-        target.onBitmapFailed(errorDrawable);
       } else {
-        // TODO what now??
-        target.onBitmapFailed(null);
+        target.onBitmapFailed(errorDrawable);
       }
     }
   }

picasso/src/test/java/com/squareup/picasso/TargetActionTest.java

@@ -19,17 +19,18 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.widget.ImageView;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.squareup.picasso.Picasso.LoadedFrom.MEMORY;
 import static com.squareup.picasso.Picasso.RequestTransformer.IDENTITY;
-import static com.squareup.picasso.TestUtils.*;
-import static com.squareup.picasso.TestUtils.mockCallback;
+import static com.squareup.picasso.TestUtils.BITMAP_1;
+import static com.squareup.picasso.TestUtils.BITMAP_3;
+import static com.squareup.picasso.TestUtils.RESOURCE_ID_1;
+import static com.squareup.picasso.TestUtils.URI_KEY_1;
+import static com.squareup.picasso.TestUtils.mockTarget;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;