🔨 UriModelRegistry reame to UriModelManager

Kururu-Q · Oct 29, 2017 · ada2554 · ada2554
1 parent 019c7b8
commit ada2554
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 21 deletions.
diff --git a/docs/logs/log_2.6.0_p1.md b/docs/logs/log_2.6.0_p1.md
@@ -6,6 +6,7 @@
 * :hammer: Tile 重命名为 Block
 * :hammer: ErrorTracker.onTileSortError() 重命名为 onBlockSortError
 * :hammer: 所有 tile 相关的名字 全部改成了 block
+* :hammer: UriModelRegistry 重命名为 UriModelManager
 
 sample app:
 * :bug: 修复 UNSPLASH 页面没有加载完数据就切换到别的页面时崩溃的 BUG

diff --git a/docs/wiki/display_video_thumbnail.md b/docs/wiki/display_video_thumbnail.md
@@ -20,11 +20,11 @@ compile 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.14'
 
 2.拷贝 [VideoThumbnailUriModel.java] 到你的 app 中
 
-3.在 Application 中将 [VideoThumbnailUriModel.java] 加入到 [UriModelRegistry] 中，如下：
+3.在 Application 中将 [VideoThumbnailUriModel.java] 加入到 [UriModelManager] 中，如下：
 
 ```java
 Configuration configuration = Sketch.with(context).getConfiguration();
-configuration.getUriModelRegistry().add(new VideoThumbnailUriModel());
+configuration.getUriModelManager().add(new VideoThumbnailUriModel());
 ```
 
 4.显示视频缩略图
@@ -47,4 +47,4 @@ sketchImageView.displayImage(videoFileUri);
 [sample-video-thumbnail]: ../../sample-video-thumbnail/
 [FFmpegMediaMetadataRetriever]: https://github.com/wseemann/FFmpegMediaMetadataRetriever
 [VideoThumbnailUriModel.java]: ../../sample-video-thumbnail/src/main/java/me/xiaopan/ssvt/VideoThumbnailUriModel.java
-[UriModelRegistry]: ../../sketch/src/main/java/me/xiaopan/sketch/uri/UriModelRegistry.java
+[UriModelManager]: ../../sketch/src/main/java/me/xiaopan/sketch/uri/UriModelManager.java
diff --git a/docs/wiki/initializer.md b/docs/wiki/initializer.md
@@ -32,7 +32,7 @@ public class MyInitializer implements Initializer {
 
     @Override
     public void onInitialize(Context context, Configuration configuration) {
-        configuration.getUriModelRegistry().add(new XpkIconUriModel());
+        configuration.getUriModelManager().add(new XpkIconUriModel());
         configuration.setErrorTracker(new MyErrorTracker(context));
     }
 }

diff --git a/docs/wiki/memory_cache_state_image.md b/docs/wiki/memory_cache_state_image.md
@@ -80,7 +80,7 @@ public class ImageFragment extends Fragment {
         DisplayOptions options = sketchImageView.getOptions();
 
         Configuration configuration = Sketch.with(getActivity()).getConfiguration();
-        UriModel uriModel = configuration.getUriModelRegistry().match(imageUri);
+        UriModel uriModel = configuration.getUriModelManager().match(imageUri);
         String loadingImageMemoryCacheKey = SketchUtils.makeRequestKey(imageUri, uriModel, optionsKey);       
         options.setLoadingImage(new MemoryCacheStateImage(loadingImageMemoryCacheKey, null));
 

diff --git a/docs/wiki/uri_model.md b/docs/wiki/uri_model.md
@@ -117,7 +117,7 @@ if (uriModel.isFromNet()){
 ```java
 Configuration configuration = ...;
 
-configuration.getUriModelRegistry().add(new MyUriModel());
+configuration.getUriModelManager().add(new MyUriModel());
 ```
 
 #### AbsDiskCacheUriModel

diff --git a/sample-video-thumbnail/src/main/java/me/xiaopan/ssvt/SketchInitializer.kt b/sample-video-thumbnail/src/main/java/me/xiaopan/ssvt/SketchInitializer.kt
@@ -8,6 +8,6 @@ import me.xiaopan.sketch.Initializer
 class SketchInitializer : Initializer {
 
     override fun onInitialize(context: Context, configuration: Configuration) {
-        configuration.uriModelRegistry.add(VideoThumbnailUriModel())
+        configuration.uriModelManager.add(VideoThumbnailUriModel())
     }
 }
diff --git a/sample/src/main/java/me/xiaopan/sketchsample/SampleSketchInitializer.kt b/sample/src/main/java/me/xiaopan/sketchsample/SampleSketchInitializer.kt
@@ -42,7 +42,7 @@ class SampleSketchInitializer : Initializer {
 
         configuration!!.errorTracker = SampleErrorTracker(context!!)
 
-        configuration!!.uriModelRegistry.add(XpkIconUriModel())
+        configuration!!.uriModelManager.add(XpkIconUriModel())
     }
 
     @Subscribe

diff --git a/sketch/src/main/java/me/xiaopan/sketch/Configuration.java b/sketch/src/main/java/me/xiaopan/sketch/Configuration.java
@@ -51,7 +51,7 @@
 import me.xiaopan.sketch.request.RequestFactory;
 import me.xiaopan.sketch.request.Resize;
 import me.xiaopan.sketch.uri.UriModel;
-import me.xiaopan.sketch.uri.UriModelRegistry;
+import me.xiaopan.sketch.uri.UriModelManager;
 
 /**
  * {@link Sketch} 唯一配置类
@@ -61,7 +61,7 @@ public final class Configuration {
 
     private Context context;
 
-    private UriModelRegistry uriModelRegistry;
+    private UriModelManager uriModelManager;
     private OptionsFilterRegistry optionsFilterRegistry;
 
     private DiskCache diskCache;
@@ -89,7 +89,7 @@ public final class Configuration {
         context = context.getApplicationContext();
         this.context = context;
 
-        this.uriModelRegistry = new UriModelRegistry();
+        this.uriModelManager = new UriModelManager();
         this.optionsFilterRegistry = new OptionsFilterRegistry();
 
         // 由于默认的缓存文件名称从 URLEncoder 加密变成了 MD5 所以这里要升级一下版本号，好清除旧的缓存
@@ -132,11 +132,11 @@ public Context getContext() {
     /**
      * 获取 {@link UriModel} 管理器
      *
-     * @return {@link UriModelRegistry}. {@link UriModel} 管理器
+     * @return {@link UriModelManager}. {@link UriModel} 管理器
      */
     @NonNull
-    public UriModelRegistry getUriModelRegistry() {
-        return uriModelRegistry;
+    public UriModelManager getUriModelManager() {
+        return uriModelManager;
     }
 
     /**
@@ -751,7 +751,7 @@ public Configuration setMobileDataPauseDownloadEnabled(boolean mobileDataPauseDo
     @NonNull
     public String getInfo() {
         return NAME + ": " +
-                "\n" + "uriModelRegistry：" + uriModelRegistry.getKey() +
+                "\n" + "uriModelManager：" + uriModelManager.getKey() +
                 "\n" + "optionsFilterRegistry：" + optionsFilterRegistry.getKey() +
 
                 "\n" + "diskCache：" + diskCache.getKey() +

diff --git a/sketch/src/main/java/me/xiaopan/sketch/uri/UriModel.java b/sketch/src/main/java/me/xiaopan/sketch/uri/UriModel.java
@@ -39,7 +39,7 @@ public abstract class UriModel {
      */
     @Nullable
     public static UriModel match(@NonNull Sketch sketch, @NonNull String uri) {
-        return !TextUtils.isEmpty(uri) ? sketch.getConfiguration().getUriModelRegistry().match(uri) : null;
+        return !TextUtils.isEmpty(uri) ? sketch.getConfiguration().getUriModelManager().match(uri) : null;
     }
 
     /**

diff --git a/.../xiaopan/sketch/uri/UriModelRegistry.java → ...e/xiaopan/sketch/uri/UriModelManager.java b/.../xiaopan/sketch/uri/UriModelRegistry.java → ...e/xiaopan/sketch/uri/UriModelManager.java
@@ -28,10 +28,10 @@
 /**
  * 负责管理和匹配 {@link UriModel}
  */
-public class UriModelRegistry implements Identifier{
+public class UriModelManager implements Identifier{
     private List<UriModel> uriModelList = new LinkedList<>();
 
-    public UriModelRegistry() {
+    public UriModelManager() {
         this.uriModelList.add(new HttpUriModel());
         this.uriModelList.add(new HttpsUriModel());
         this.uriModelList.add(new FileUriModel());
@@ -47,7 +47,7 @@ public UriModelRegistry() {
     }
 
     @NonNull
-    public UriModelRegistry add(@NonNull UriModel uriModel) {
+    public UriModelManager add(@NonNull UriModel uriModel) {
         //noinspection ConstantConditions
         if (uriModel != null) {
             uriModelList.add(uriModel);
@@ -56,7 +56,7 @@ public UriModelRegistry add(@NonNull UriModel uriModel) {
     }
 
     @NonNull
-    public UriModelRegistry add(int index, @NonNull UriModel uriModel) {
+    public UriModelManager add(int index, @NonNull UriModel uriModel) {
         //noinspection ConstantConditions
         if (uriModel != null) {
             uriModelList.add(index, uriModel);
@@ -85,6 +85,6 @@ public UriModel match(@NonNull String uri) {
     @NonNull
     @Override
     public String getKey() {
-        return "UriModelRegistry";
+        return "UriModelManager";
     }
 }