From b7c7c2b2505f996dbda219faeb0d08dc1c9982d7 Mon Sep 17 00:00:00 2001 From: Sam Judd Date: Tue, 24 Jun 2014 18:34:01 -0700 Subject: [PATCH] Move resource into Engine package. --- .../com/bumptech/glide/load/MultiTransformation.java | 2 +- .../com/bumptech/glide/load/ResourceDecoder.java | 2 +- .../com/bumptech/glide/load/ResourceEncoder.java | 2 +- .../main/java/com/bumptech/glide/load/SkipCache.java | 2 +- .../java/com/bumptech/glide/load/Transformation.java | 2 +- .../java/com/bumptech/glide/load/engine/Engine.java | 1 - .../com/bumptech/glide/load/engine/EngineJob.java | 1 - .../glide/load/engine/EngineJobListener.java | 1 - .../bumptech/glide/{ => load/engine}/Resource.java | 10 +++++----- .../bumptech/glide/load/engine/ResourceRunner.java | 1 - .../glide/load/engine/SourceResourceRunner.java | 1 - .../glide/load/engine/cache/LruResourceCache.java | 2 +- .../glide/load/engine/cache/MemoryCache.java | 2 +- .../glide/load/engine/cache/MemoryCacheAdapter.java | 2 +- .../glide/load/resource/NullCacheDecoder.java | 2 +- .../load/resource/bitmap/BitmapDrawableResource.java | 2 +- .../glide/load/resource/bitmap/BitmapEncoder.java | 2 +- .../glide/load/resource/bitmap/BitmapResource.java | 2 +- .../glide/load/resource/bitmap/CenterCrop.java | 2 +- .../resource/bitmap/FileDescriptorBitmapDecoder.java | 2 +- .../glide/load/resource/bitmap/FitCenter.java | 2 +- .../resource/bitmap/ImageVideoBitmapDecoder.java | 2 +- .../load/resource/bitmap/StreamBitmapDecoder.java | 2 +- .../glide/load/resource/bytes/BytesResource.java | 2 +- .../glide/load/resource/gif/GifDataResource.java | 2 +- .../load/resource/gif/GifDataTransformation.java | 2 +- .../glide/load/resource/gif/GifDrawableResource.java | 2 +- .../load/resource/gif/GifFrameResourceDecoder.java | 2 +- .../glide/load/resource/gif/GifResourceEncoder.java | 2 +- .../load/resource/gifbitmap/GifBitmapWrapper.java | 2 +- .../resource/gifbitmap/GifBitmapWrapperResource.java | 2 +- .../gifbitmap/GifBitmapWrapperResourceDecoder.java | 2 +- .../gifbitmap/GifBitmapWrapperResourceEncoder.java | 2 +- .../GifBitmapWrapperStreamResourceDecoder.java | 2 +- .../gifbitmap/GifBitmapWrapperTransformation.java | 2 +- .../resource/transcode/BitmapBytesTranscoder.java | 2 +- .../resource/transcode/BitmapDrawableTranscoder.java | 2 +- .../GifBitmapWrapperDrawableTranscoder.java | 2 +- .../resource/transcode/GifDataBytesTranscoder.java | 2 +- .../transcode/GifDataDrawableTranscoder.java | 2 +- .../load/resource/transcode/ResourceTranscoder.java | 2 +- .../load/resource/transcode/UnitTranscoder.java | 2 +- .../com/bumptech/glide/request/GenericRequest.java | 2 +- .../com/bumptech/glide/request/ResourceCallback.java | 2 +- .../src/test/java/com/bumptech/glide/GlideTest.java | 1 + .../bumptech/glide/load/MultiTransformationTest.java | 2 +- .../java/com/bumptech/glide/load/SkipCacheTest.java | 2 +- .../bumptech/glide/load/engine/EngineJobTest.java | 1 - .../com/bumptech/glide/load/engine/EngineTest.java | 1 - .../glide/load/engine/ResourceRunnerTest.java | 1 - .../glide/{ => load/engine}/ResourceTest.java | 12 +++++++++++- .../glide/load/engine/SourceResourceRunnerTest.java | 1 - .../load/engine/cache/LruResourceCacheTest.java | 2 +- .../load/resource/bitmap/BitmapEncoderTest.java | 2 +- .../glide/load/resource/bitmap/CenterCropTest.java | 2 +- .../glide/load/resource/bitmap/FitCenterTest.java | 2 +- .../resource/bitmap/ImageVideoBitmapDecoderTest.java | 2 +- .../resource/bitmap/StreamBitmapDecoderTest.java | 2 +- .../load/resource/gif/GifDataTransformationTest.java | 2 +- .../load/resource/gif/GifDrawableResourceTest.java | 2 +- .../load/resource/gif/GifResourceEncoderTest.java | 2 +- .../gifbitmap/GifBitmapResourceDecoderTest.java | 2 +- .../gifbitmap/GifBitmapResourceEncoderTest.java | 2 +- .../GifBitmapStreamResourceDecoderTest.java | 4 +--- .../gifbitmap/GifBitmapWrapperResourceTest.java | 2 +- .../resource/gifbitmap/GifBitmapWrapperTest.java | 2 +- .../GifBitmapWrapperTransformationTest.java | 2 +- .../transcode/BitmapBytesTranscoderTest.java | 2 +- .../transcode/BitmapDrawableTranscoderTest.java | 2 +- .../GifBitmapWrapperDrawableTranscoderTest.java | 2 +- .../transcode/GifDataBytesTranscoderTest.java | 2 +- .../transcode/GifDataDrawableTranscoderTest.java | 2 +- .../load/resource/transcode/UnitTranscoderTest.java | 2 +- .../bumptech/glide/request/GenericRequestTest.java | 2 +- 74 files changed, 79 insertions(+), 79 deletions(-) rename library/src/main/java/com/bumptech/glide/{ => load/engine}/Resource.java (90%) rename library/src/test/java/com/bumptech/glide/{ => load/engine}/ResourceTest.java (91%) diff --git a/library/src/main/java/com/bumptech/glide/load/MultiTransformation.java b/library/src/main/java/com/bumptech/glide/load/MultiTransformation.java index 9e3a35916..cc7ffce4e 100644 --- a/library/src/main/java/com/bumptech/glide/load/MultiTransformation.java +++ b/library/src/main/java/com/bumptech/glide/load/MultiTransformation.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import java.util.List; diff --git a/library/src/main/java/com/bumptech/glide/load/ResourceDecoder.java b/library/src/main/java/com/bumptech/glide/load/ResourceDecoder.java index 0d8614c2b..3e21364fb 100644 --- a/library/src/main/java/com/bumptech/glide/load/ResourceDecoder.java +++ b/library/src/main/java/com/bumptech/glide/load/ResourceDecoder.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import java.io.IOException; diff --git a/library/src/main/java/com/bumptech/glide/load/ResourceEncoder.java b/library/src/main/java/com/bumptech/glide/load/ResourceEncoder.java index 18eee5e59..86f4e6e2d 100644 --- a/library/src/main/java/com/bumptech/glide/load/ResourceEncoder.java +++ b/library/src/main/java/com/bumptech/glide/load/ResourceEncoder.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import java.io.OutputStream; diff --git a/library/src/main/java/com/bumptech/glide/load/SkipCache.java b/library/src/main/java/com/bumptech/glide/load/SkipCache.java index 12ec825a4..d0945e1d0 100644 --- a/library/src/main/java/com/bumptech/glide/load/SkipCache.java +++ b/library/src/main/java/com/bumptech/glide/load/SkipCache.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import java.io.OutputStream; diff --git a/library/src/main/java/com/bumptech/glide/load/Transformation.java b/library/src/main/java/com/bumptech/glide/load/Transformation.java index e37d07779..a34bebc7f 100644 --- a/library/src/main/java/com/bumptech/glide/load/Transformation.java +++ b/library/src/main/java/com/bumptech/glide/load/Transformation.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; /** * A class for performing an arbitrary transformation on a bitmap diff --git a/library/src/main/java/com/bumptech/glide/load/engine/Engine.java b/library/src/main/java/com/bumptech/glide/load/engine/Engine.java index 8a20ae445..427104c85 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/Engine.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/Engine.java @@ -5,7 +5,6 @@ import android.os.Looper; import android.os.MessageQueue; import android.util.Log; import com.bumptech.glide.Priority; -import com.bumptech.glide.Resource; import com.bumptech.glide.load.Key; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.ResourceEncoder; diff --git a/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java b/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java index 5447a2df4..ddf7996b0 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java @@ -2,7 +2,6 @@ package com.bumptech.glide.load.engine; import android.os.Handler; import android.util.Log; -import com.bumptech.glide.Resource; import com.bumptech.glide.load.Key; import com.bumptech.glide.request.ResourceCallback; import com.bumptech.glide.util.LogTime; diff --git a/library/src/main/java/com/bumptech/glide/load/engine/EngineJobListener.java b/library/src/main/java/com/bumptech/glide/load/engine/EngineJobListener.java index 25565ba81..e0c164103 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/EngineJobListener.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/EngineJobListener.java @@ -1,6 +1,5 @@ package com.bumptech.glide.load.engine; -import com.bumptech.glide.Resource; import com.bumptech.glide.load.Key; public interface EngineJobListener { diff --git a/library/src/main/java/com/bumptech/glide/Resource.java b/library/src/main/java/com/bumptech/glide/load/engine/Resource.java similarity index 90% rename from library/src/main/java/com/bumptech/glide/Resource.java rename to library/src/main/java/com/bumptech/glide/load/engine/Resource.java index 8a7dc481f..8340f0730 100644 --- a/library/src/main/java/com/bumptech/glide/Resource.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/Resource.java @@ -1,4 +1,4 @@ -package com.bumptech.glide; +package com.bumptech.glide.load.engine; import android.os.Looper; import com.bumptech.glide.load.Key; @@ -18,7 +18,7 @@ public abstract class Resource { private Key key; private boolean isCacheable; - public interface ResourceListener { + interface ResourceListener { public void onResourceReleased(Key key, Resource resource); } @@ -28,16 +28,16 @@ public abstract class Resource { protected abstract void recycleInternal(); - public void setResourceListener(Key key, ResourceListener listener) { + void setResourceListener(Key key, ResourceListener listener) { this.key = key; this.listener = listener; } - public void setCacheable(boolean isCacheable) { + void setCacheable(boolean isCacheable) { this.isCacheable = isCacheable; } - public boolean isCacheable() { + boolean isCacheable() { return isCacheable; } diff --git a/library/src/main/java/com/bumptech/glide/load/engine/ResourceRunner.java b/library/src/main/java/com/bumptech/glide/load/engine/ResourceRunner.java index e8d60883b..cce7f473b 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/ResourceRunner.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/ResourceRunner.java @@ -3,7 +3,6 @@ package com.bumptech.glide.load.engine; import android.os.SystemClock; import android.util.Log; import com.bumptech.glide.Priority; -import com.bumptech.glide.Resource; import com.bumptech.glide.load.Key; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.Transformation; diff --git a/library/src/main/java/com/bumptech/glide/load/engine/SourceResourceRunner.java b/library/src/main/java/com/bumptech/glide/load/engine/SourceResourceRunner.java index bbd8d329a..d04a57d17 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/SourceResourceRunner.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/SourceResourceRunner.java @@ -3,7 +3,6 @@ package com.bumptech.glide.load.engine; import android.os.SystemClock; import android.util.Log; import com.bumptech.glide.Priority; -import com.bumptech.glide.Resource; import com.bumptech.glide.load.Key; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.ResourceEncoder; diff --git a/library/src/main/java/com/bumptech/glide/load/engine/cache/LruResourceCache.java b/library/src/main/java/com/bumptech/glide/load/engine/cache/LruResourceCache.java index 5e93659f9..d3d64f7fc 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/cache/LruResourceCache.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/cache/LruResourceCache.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.engine.cache; import com.bumptech.glide.load.Key; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.util.LruCache; import static android.content.ComponentCallbacks2.TRIM_MEMORY_BACKGROUND; diff --git a/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCache.java b/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCache.java index a92d1dfb4..23c7d7711 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCache.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCache.java @@ -2,7 +2,7 @@ package com.bumptech.glide.load.engine.cache; import android.content.ComponentCallbacks2; import com.bumptech.glide.load.Key; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; /** * An interface for adding and removing resources from an in memory cache diff --git a/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCacheAdapter.java b/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCacheAdapter.java index 40cd86fd6..ab5ad8428 100644 --- a/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCacheAdapter.java +++ b/library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCacheAdapter.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.engine.cache; import com.bumptech.glide.load.Key; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; public class MemoryCacheAdapter implements MemoryCache { diff --git a/library/src/main/java/com/bumptech/glide/load/resource/NullCacheDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/NullCacheDecoder.java index 4505450eb..f35cf80cd 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/NullCacheDecoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/NullCacheDecoder.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import java.io.IOException; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResource.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResource.java index af95f6409..126253d66 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResource.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResource.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.drawable.BitmapDrawable; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.util.Util; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java index 2d67c2728..145aee79b 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceEncoder; import java.io.OutputStream; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapResource.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapResource.java index 74e242586..e72268b88 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapResource.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapResource.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.util.Util; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/CenterCrop.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/CenterCrop.java index e6912640a..28135ba56 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/CenterCrop.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/CenterCrop.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.Transformation; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FileDescriptorBitmapDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FileDescriptorBitmapDecoder.java index b2449915d..15dc49041 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FileDescriptorBitmapDecoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FileDescriptorBitmapDecoder.java @@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; import android.os.ParcelFileDescriptor; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.DecodeFormat; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java index 7bd4675c6..e8d11977f 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.Transformation; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoder.java index a258ee713..53436d69b 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoder.java @@ -3,7 +3,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; import android.os.ParcelFileDescriptor; import android.util.Log; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.model.ImageVideoWrapper; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoder.java index 97826b24c..b8bdb5ba1 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoder.java @@ -3,7 +3,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.content.Context; import android.graphics.Bitmap; import com.bumptech.glide.Glide; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.DecodeFormat; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bytes/BytesResource.java b/library/src/main/java/com/bumptech/glide/load/resource/bytes/BytesResource.java index 265c7fd3b..b6d369bba 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bytes/BytesResource.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bytes/BytesResource.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.bytes; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; public class BytesResource extends Resource { private byte[] bytes; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataResource.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataResource.java index 78a7ef200..b7cc468de 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataResource.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataResource.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.gif; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; public class GifDataResource extends Resource { private GifData gifData; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataTransformation.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataTransformation.java index cb2b9924a..22402e2de 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataTransformation.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataTransformation.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gif; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.MultiTransformation; import com.bumptech.glide.load.Transformation; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDrawableResource.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDrawableResource.java index 0da6f86d5..cfa984b7b 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDrawableResource.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifDrawableResource.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.gif; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; public class GifDrawableResource extends Resource { private Resource wrapped; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoder.java index d07709f01..ee2fc821f 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoder.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gif; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.gifdecoder.GifDecoder; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifResourceEncoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifResourceEncoder.java index 9bce19ef3..31893c9a9 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gif/GifResourceEncoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gif/GifResourceEncoder.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gif; import android.util.Log; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceEncoder; import java.io.IOException; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapper.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapper.java index 3dc4bf570..2540f5932 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapper.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapper.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.gif.GifData; public class GifBitmapWrapper { diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResource.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResource.java index 25f105f71..22e6b9696 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResource.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResource.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.gif.GifData; public class GifBitmapWrapperResource extends Resource { diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceDecoder.java index 6183cfce2..28b02a459 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceDecoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceDecoder.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.model.ImageVideoWrapper; import com.bumptech.glide.load.resource.bitmap.ImageHeaderParser; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceEncoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceEncoder.java index 903a3ea68..5a10cece7 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceEncoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceEncoder.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceEncoder; import com.bumptech.glide.load.resource.gif.GifData; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperStreamResourceDecoder.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperStreamResourceDecoder.java index 80ebbca76..51ccb2e1b 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperStreamResourceDecoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperStreamResourceDecoder.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.gifbitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.model.ImageVideoWrapper; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformation.java b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformation.java index 9b4ffcfe8..f0f24047c 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformation.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformation.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.resource.gif.GifData; import com.bumptech.glide.load.resource.gif.GifDataTransformation; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoder.java index 528595496..96b9d6622 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoder.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.transcode; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.bytes.BytesResource; import java.io.ByteArrayOutputStream; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java index 9c85efdd4..e511865d9 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java @@ -3,7 +3,7 @@ package com.bumptech.glide.load.resource.transcode; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.bitmap.BitmapDrawableResource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoder.java index 29bf00bbe..b5336f050 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoder.java @@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.transcode; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.gif.GifData; import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoder.java index 437ff8e43..40f924780 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoder.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.transcode; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.bytes.BytesResource; import com.bumptech.glide.load.resource.gif.GifData; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoder.java index ef77bd124..c86346477 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoder.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.transcode; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.gif.GifData; import com.bumptech.glide.load.resource.gif.GifDrawable; import com.bumptech.glide.load.resource.gif.GifDrawableResource; diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/ResourceTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/ResourceTranscoder.java index e8ab9ebdd..d82dad9c8 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/ResourceTranscoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/ResourceTranscoder.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.transcode; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; /** * Transcodes a resource of one type to a resource of another type. diff --git a/library/src/main/java/com/bumptech/glide/load/resource/transcode/UnitTranscoder.java b/library/src/main/java/com/bumptech/glide/load/resource/transcode/UnitTranscoder.java index 58bb5dafa..fd81a9d35 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/transcode/UnitTranscoder.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/transcode/UnitTranscoder.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.transcode; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; public class UnitTranscoder implements ResourceTranscoder { private static final UnitTranscoder UNIT_TRANSCODER = new UnitTranscoder(); diff --git a/library/src/main/java/com/bumptech/glide/request/GenericRequest.java b/library/src/main/java/com/bumptech/glide/request/GenericRequest.java index 906264eaa..ea6fb3224 100644 --- a/library/src/main/java/com/bumptech/glide/request/GenericRequest.java +++ b/library/src/main/java/com/bumptech/glide/request/GenericRequest.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.util.Log; import com.bumptech.glide.Priority; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.ResourceEncoder; import com.bumptech.glide.load.Transformation; diff --git a/library/src/main/java/com/bumptech/glide/request/ResourceCallback.java b/library/src/main/java/com/bumptech/glide/request/ResourceCallback.java index da5591ef5..e1332f8bc 100644 --- a/library/src/main/java/com/bumptech/glide/request/ResourceCallback.java +++ b/library/src/main/java/com/bumptech/glide/request/ResourceCallback.java @@ -1,6 +1,6 @@ package com.bumptech.glide.request; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; public interface ResourceCallback { diff --git a/library/src/test/java/com/bumptech/glide/GlideTest.java b/library/src/test/java/com/bumptech/glide/GlideTest.java index bd69415aa..859a126c3 100644 --- a/library/src/test/java/com/bumptech/glide/GlideTest.java +++ b/library/src/test/java/com/bumptech/glide/GlideTest.java @@ -20,6 +20,7 @@ import com.android.volley.toolbox.NoCache; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.ResourceEncoder; import com.bumptech.glide.load.data.DataFetcher; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.engine.cache.DiskCache; import com.bumptech.glide.load.engine.cache.MemoryCache; diff --git a/library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java b/library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java index 55b4e6638..69609039f 100644 --- a/library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java +++ b/library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import org.junit.Test; import java.util.ArrayList; diff --git a/library/src/test/java/com/bumptech/glide/load/SkipCacheTest.java b/library/src/test/java/com/bumptech/glide/load/SkipCacheTest.java index c8cd0a225..8e4923936 100644 --- a/library/src/test/java/com/bumptech/glide/load/SkipCacheTest.java +++ b/library/src/test/java/com/bumptech/glide/load/SkipCacheTest.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import org.junit.Test; import java.io.ByteArrayOutputStream; diff --git a/library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java b/library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java index 7fb0fb64a..44cdf4fbe 100644 --- a/library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java +++ b/library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java @@ -1,7 +1,6 @@ package com.bumptech.glide.load.engine; import android.os.Handler; -import com.bumptech.glide.Resource; import com.bumptech.glide.load.Key; import com.bumptech.glide.load.engine.cache.MemoryCache; import com.bumptech.glide.request.ResourceCallback; diff --git a/library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java b/library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java index 773c406c8..ed8ea65e5 100644 --- a/library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java +++ b/library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java @@ -1,7 +1,6 @@ package com.bumptech.glide.load.engine; import com.bumptech.glide.Priority; -import com.bumptech.glide.Resource; import com.bumptech.glide.load.Key; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.ResourceEncoder; diff --git a/library/src/test/java/com/bumptech/glide/load/engine/ResourceRunnerTest.java b/library/src/test/java/com/bumptech/glide/load/engine/ResourceRunnerTest.java index 82b0b734c..2e8a9f385 100644 --- a/library/src/test/java/com/bumptech/glide/load/engine/ResourceRunnerTest.java +++ b/library/src/test/java/com/bumptech/glide/load/engine/ResourceRunnerTest.java @@ -1,7 +1,6 @@ package com.bumptech.glide.load.engine; import com.bumptech.glide.Priority; -import com.bumptech.glide.Resource; import com.bumptech.glide.load.Key; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.Transformation; diff --git a/library/src/test/java/com/bumptech/glide/ResourceTest.java b/library/src/test/java/com/bumptech/glide/load/engine/ResourceTest.java similarity index 91% rename from library/src/test/java/com/bumptech/glide/ResourceTest.java rename to library/src/test/java/com/bumptech/glide/load/engine/ResourceTest.java index 4adbb8ee5..6e00a9c3c 100644 --- a/library/src/test/java/com/bumptech/glide/ResourceTest.java +++ b/library/src/test/java/com/bumptech/glide/load/engine/ResourceTest.java @@ -1,4 +1,4 @@ -package com.bumptech.glide; +package com.bumptech.glide.load.engine; import com.bumptech.glide.load.Key; import junit.framework.Assert; @@ -8,6 +8,8 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -119,6 +121,14 @@ public class ResourceTest { resource.release(); } + @Test + public void testCanSetAndGetIsCacheable() { + resource.setCacheable(true); + assertTrue(resource.isCacheable()); + resource.setCacheable(false); + assertFalse(resource.isCacheable()); + } + private static class MockResource extends Resource { int recycled = 0; @Override diff --git a/library/src/test/java/com/bumptech/glide/load/engine/SourceResourceRunnerTest.java b/library/src/test/java/com/bumptech/glide/load/engine/SourceResourceRunnerTest.java index 8f56bbef8..f92de0030 100644 --- a/library/src/test/java/com/bumptech/glide/load/engine/SourceResourceRunnerTest.java +++ b/library/src/test/java/com/bumptech/glide/load/engine/SourceResourceRunnerTest.java @@ -1,7 +1,6 @@ package com.bumptech.glide.load.engine; import com.bumptech.glide.Priority; -import com.bumptech.glide.Resource; import com.bumptech.glide.load.Key; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.ResourceEncoder; diff --git a/library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java b/library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java index 96e2714de..752c03837 100644 --- a/library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java +++ b/library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java @@ -2,7 +2,7 @@ package com.bumptech.glide.load.engine.cache; import android.content.ComponentCallbacks2; import com.bumptech.glide.load.Key; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import org.junit.Test; import java.io.UnsupportedEncodingException; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java index 760e71885..085754b7c 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.tests.Util; import org.junit.Before; import org.junit.Test; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java index 8a8b30012..65624f26b 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.tests.Util; import org.junit.Before; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java index 396768fd4..c2d857a46 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.tests.Util; import org.junit.Before; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoderTest.java index d16fd7839..d0fd7ffe4 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoderTest.java @@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; import android.os.ParcelFileDescriptor; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.model.ImageVideoWrapper; import com.bumptech.glide.tests.Util; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoderTest.java index 35d93a237..086a31996 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoderTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.bitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.DecodeFormat; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.tests.Util; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDataTransformationTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDataTransformationTest.java index e2e345cf2..be97142f9 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDataTransformationTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDataTransformationTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gif; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.Transformation; import org.junit.Before; import org.junit.Test; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java index dbce8a332..8b3fbdead 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.gif; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifResourceEncoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifResourceEncoderTest.java index 6199caf56..d71f1eaa5 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifResourceEncoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/gif/GifResourceEncoderTest.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.gif; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.tests.Util; import org.junit.Before; import org.junit.Test; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceDecoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceDecoderTest.java index 26fc23f65..09555d017 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceDecoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceDecoderTest.java @@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; import android.os.ParcelFileDescriptor; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.model.ImageVideoWrapper; import com.bumptech.glide.load.resource.gif.GifData; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceEncoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceEncoderTest.java index 058049ea6..7147f4496 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceEncoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceEncoderTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceEncoder; import com.bumptech.glide.load.resource.gif.GifData; import org.junit.Before; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapStreamResourceDecoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapStreamResourceDecoderTest.java index bb695335f..ddc08bd22 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapStreamResourceDecoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapStreamResourceDecoderTest.java @@ -1,10 +1,8 @@ package com.bumptech.glide.load.resource.gifbitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.model.ImageVideoWrapper; -import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper; -import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapperStreamResourceDecoder; import org.junit.Before; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceTest.java index 3f28bbaee..f0a40674b 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.gif.GifData; import org.junit.Before; import org.junit.Test; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTest.java index 6cf0c5c8e..057a974ad 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.gif.GifData; import org.junit.Test; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformationTest.java b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformationTest.java index bd4f3de9d..1a79dd2e5 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformationTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformationTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.gifbitmap; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.resource.gif.GifData; import org.junit.Before; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java index aebbe5235..554065076 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java @@ -1,7 +1,7 @@ package com.bumptech.glide.load.resource.transcode; import android.graphics.Bitmap; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.tests.Util; import org.junit.Before; import org.junit.Test; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java index d2cd6a405..03d0d96a0 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java @@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.transcode; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.tests.Util; import org.junit.Test; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoderTest.java index 7c0b504aa..f02b868af 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoderTest.java @@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.transcode; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.gif.GifData; import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper; import com.bumptech.glide.tests.Util; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoderTest.java index 6c0c8d980..c2e5ea845 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoderTest.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.transcode; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.gif.GifData; import com.bumptech.glide.tests.Util; import org.junit.Before; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoderTest.java index e54ee8708..00ff16168 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoderTest.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.transcode; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.resource.gif.GifData; import com.bumptech.glide.load.resource.gif.GifDrawable; import com.bumptech.glide.tests.Util; diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java b/library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java index 6cca2a532..e2cff811d 100644 --- a/library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java +++ b/library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java @@ -1,6 +1,6 @@ package com.bumptech.glide.load.resource.transcode; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.tests.Util; import org.junit.Test; 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 ac1281d8d..2e2d9142f 100644 --- a/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java +++ b/library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java @@ -6,7 +6,7 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import com.bumptech.glide.Priority; -import com.bumptech.glide.Resource; +import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.ResourceDecoder; import com.bumptech.glide.load.ResourceEncoder; import com.bumptech.glide.load.Transformation; -- GitLab