From 1a0d2f25951a536b465c5b2a1dfa5d3c076de912 Mon Sep 17 00:00:00 2001 From: Sam Judd Date: Fri, 13 Jun 2014 19:26:40 -0700 Subject: [PATCH] Move GenericRequest out of bitmap package --- .../main/java/com/bumptech/glide/BitmapRequestBuilder.java | 2 +- .../main/java/com/bumptech/glide/DrawableRequestBuilder.java | 2 +- .../main/java/com/bumptech/glide/GenericRequestBuilder.java | 4 ++-- .../bumptech/glide/request/{bitmap => }/GenericRequest.java | 5 +---- .../bumptech/glide/request/{bitmap => }/RequestListener.java | 5 ++--- .../java/com/bumptech/glide/request/GenericRequestTest.java | 1 - 6 files changed, 7 insertions(+), 12 deletions(-) rename library/src/main/java/com/bumptech/glide/request/{bitmap => }/GenericRequest.java (97%) rename library/src/main/java/com/bumptech/glide/request/{bitmap => }/RequestListener.java (94%) diff --git a/library/src/main/java/com/bumptech/glide/BitmapRequestBuilder.java b/library/src/main/java/com/bumptech/glide/BitmapRequestBuilder.java index 90eb014ca..65e03b13c 100644 --- a/library/src/main/java/com/bumptech/glide/BitmapRequestBuilder.java +++ b/library/src/main/java/com/bumptech/glide/BitmapRequestBuilder.java @@ -20,7 +20,7 @@ import com.bumptech.glide.load.resource.transcode.ResourceTranscoder; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.model.ImageVideoWrapper; import com.bumptech.glide.provider.LoadProvider; -import com.bumptech.glide.request.bitmap.RequestListener; +import com.bumptech.glide.request.RequestListener; import java.io.InputStream; diff --git a/library/src/main/java/com/bumptech/glide/DrawableRequestBuilder.java b/library/src/main/java/com/bumptech/glide/DrawableRequestBuilder.java index ec0b48e56..4f7f8302b 100644 --- a/library/src/main/java/com/bumptech/glide/DrawableRequestBuilder.java +++ b/library/src/main/java/com/bumptech/glide/DrawableRequestBuilder.java @@ -14,7 +14,7 @@ import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper; import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapperTransformation; import com.bumptech.glide.load.resource.transcode.ResourceTranscoder; import com.bumptech.glide.provider.LoadProvider; -import com.bumptech.glide.request.bitmap.RequestListener; +import com.bumptech.glide.request.RequestListener; import java.io.InputStream; diff --git a/library/src/main/java/com/bumptech/glide/GenericRequestBuilder.java b/library/src/main/java/com/bumptech/glide/GenericRequestBuilder.java index 622e2a8bb..1b6eb0a7d 100644 --- a/library/src/main/java/com/bumptech/glide/GenericRequestBuilder.java +++ b/library/src/main/java/com/bumptech/glide/GenericRequestBuilder.java @@ -18,8 +18,8 @@ import com.bumptech.glide.provider.LoadProvider; import com.bumptech.glide.request.Request; import com.bumptech.glide.request.RequestCoordinator; import com.bumptech.glide.request.ThumbnailRequestCoordinator; -import com.bumptech.glide.request.bitmap.GenericRequest; -import com.bumptech.glide.request.bitmap.RequestListener; +import com.bumptech.glide.request.GenericRequest; +import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.BitmapImageViewTarget; import com.bumptech.glide.request.target.Target; diff --git a/library/src/main/java/com/bumptech/glide/request/bitmap/GenericRequest.java b/library/src/main/java/com/bumptech/glide/request/GenericRequest.java similarity index 97% rename from library/src/main/java/com/bumptech/glide/request/bitmap/GenericRequest.java rename to library/src/main/java/com/bumptech/glide/request/GenericRequest.java index 5544ed16c..54bc1003e 100644 --- a/library/src/main/java/com/bumptech/glide/request/bitmap/GenericRequest.java +++ b/library/src/main/java/com/bumptech/glide/request/GenericRequest.java @@ -1,4 +1,4 @@ -package com.bumptech.glide.request.bitmap; +package com.bumptech.glide.request; import android.content.Context; import android.graphics.drawable.Drawable; @@ -15,9 +15,6 @@ import com.bumptech.glide.load.engine.Engine; import com.bumptech.glide.load.model.ModelLoader; import com.bumptech.glide.load.data.DataFetcher; import com.bumptech.glide.provider.LoadProvider; -import com.bumptech.glide.request.Request; -import com.bumptech.glide.request.RequestCoordinator; -import com.bumptech.glide.request.ResourceCallback; import com.bumptech.glide.request.target.Target; import java.io.InputStream; diff --git a/library/src/main/java/com/bumptech/glide/request/bitmap/RequestListener.java b/library/src/main/java/com/bumptech/glide/request/RequestListener.java similarity index 94% rename from library/src/main/java/com/bumptech/glide/request/bitmap/RequestListener.java rename to library/src/main/java/com/bumptech/glide/request/RequestListener.java index 222e07859..5313082b5 100644 --- a/library/src/main/java/com/bumptech/glide/request/bitmap/RequestListener.java +++ b/library/src/main/java/com/bumptech/glide/request/RequestListener.java @@ -1,4 +1,4 @@ -package com.bumptech.glide.request.bitmap; +package com.bumptech.glide.request; import com.bumptech.glide.request.target.Target; @@ -39,8 +39,7 @@ public interface RequestListener { public abstract void onException(Exception e, T model, Target target); /** - * Called when a load completes successfully, immediately after - * {@link Target#onImageReady(android.graphics.Bitmap)}. + * Called when a load completes successfully, immediately after {@link Target#onResourceReady(Object)}. * * @param model The specific model that was used to load the image. * @param target The target the model was loaded into. diff --git a/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java b/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java index 160b36567..974d43b8f 100644 --- a/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java +++ b/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java @@ -16,7 +16,6 @@ import com.bumptech.glide.load.engine.Engine; import com.bumptech.glide.load.model.ModelLoader; import com.bumptech.glide.load.data.DataFetcher; import com.bumptech.glide.provider.LoadProvider; -import com.bumptech.glide.request.bitmap.GenericRequest; import com.bumptech.glide.request.target.Target; import org.junit.Before; import org.junit.Test; -- GitLab