Clean code

Author: nostra13

library/src/com/nostra13/universalimageloader/core/LoadAndDisplayImageTask.java

@@ -17,6 +17,7 @@
 
 import android.graphics.Bitmap;
 import android.os.Handler;
+
 import com.nostra13.universalimageloader.cache.disc.DiscCacheAware;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.FailReason.FailType;
@@ -228,7 +229,7 @@ private Bitmap tryLoadBitmap() throws TaskCancelledException {
 				loadedFrom = LoadedFrom.DISC_CACHE;
 
 				checkTaskNotActual();
-				bitmap = decodeImage(cacheFileUri, uri);
+				bitmap = decodeImage(cacheFileUri);
 			}
 			if (bitmap == null || bitmap.getWidth() <= 0 || bitmap.getHeight() <= 0) {
 				log(LOG_LOAD_IMAGE_FROM_NETWORK);
@@ -238,7 +239,7 @@ private Bitmap tryLoadBitmap() throws TaskCancelledException {
 						options.isCacheOnDisc() && tryCacheImageOnDisc(imageFile) ? cacheFileUri : uri;
 
 				checkTaskNotActual();
-				bitmap = decodeImage(imageUriForDecoding, uri);
+				bitmap = decodeImage(imageUriForDecoding);
 
 				if (bitmap == null || bitmap.getWidth() <= 0 || bitmap.getHeight() <= 0) {
 					fireFailEvent(FailType.DECODING_ERROR, null);
@@ -278,9 +279,9 @@ private File getImageFileInDiscCache() {
 		return imageFile;
 	}
 
-	private Bitmap decodeImage(String imageUri, String originalImageUri) throws IOException {
+	private Bitmap decodeImage(String imageUri) throws IOException {
 		ViewScaleType viewScaleType = imageAware.getScaleType();
-		ImageDecodingInfo decodingInfo = new ImageDecodingInfo(memoryCacheKey, imageUri, originalImageUri, targetSize, viewScaleType,
+		ImageDecodingInfo decodingInfo = new ImageDecodingInfo(memoryCacheKey, imageUri, uri, targetSize, viewScaleType,
 				getDownloader(), options);
 		return decoder.decode(decodingInfo);
 	}

library/src/com/nostra13/universalimageloader/core/decode/ImageDecodingInfo.java

@@ -18,6 +18,7 @@
 import android.annotation.TargetApi;
 import android.graphics.BitmapFactory.Options;
 import android.os.Build;
+
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 import com.nostra13.universalimageloader.core.assist.ImageSize;
@@ -34,7 +35,7 @@ public class ImageDecodingInfo {
 
 	private final String imageKey;
 	private final String imageUri;
-    private final String originalImageUri;
+	private final String originalImageUri;
 	private final ImageSize targetSize;
 
 	private final ImageScaleType imageScaleType;
@@ -50,7 +51,7 @@ public ImageDecodingInfo(String imageKey, String imageUri, String originalImageU
 							 ImageDownloader downloader, DisplayImageOptions displayOptions) {
 		this.imageKey = imageKey;
 		this.imageUri = imageUri;
-        this.originalImageUri = originalImageUri;
+		this.originalImageUri = originalImageUri;
 		this.targetSize = targetSize;
 
 		this.imageScaleType = displayOptions.getImageScaleType();
@@ -101,10 +102,10 @@ public String getImageUri() {
 		return imageUri;
 	}
 
-    /** @return The original uri that the request wanted */
-    public String getOriginalImageUri() {
-        return originalImageUri;
-    }
+	/** @return The original image URI which was passed to ImageLoader */
+	public String getOriginalImageUri() {
+		return originalImageUri;
+	}
 
 	/**
 	 * @return Target size for image. Decoded bitmap should close to this size according to {@linkplain ImageScaleType