Rename GalleryInfoImpl to BaseGalleryInfo

2023-01-06 11:02:44 +08:00
1 parent 7af40f0cd7
commit 0afe331d3d
@@ -21,7 +21,7 @@ import androidx.room.PrimaryKey
 import kotlinx.parcelize.Parcelize

@Parcelize
-open class GalleryInfoImpl(
+open class BaseGalleryInfo(
    @PrimaryKey
    @ColumnInfo(name = "GID")
    override var gid: Long = 0,
@@ -15,8 +15,6 @@
 */
 package com.hippo.ehviewer.client.data

-import kotlinx.parcelize.Parcelize
-
 // @Parcelize
 class GalleryDetail(
    // @JvmField
@@ -72,7 +70,7 @@ class GalleryDetail(

    @JvmField
    var previewSet: PreviewSet? = null,
-) : GalleryInfoImpl()
+) : BaseGalleryInfo()
 // ) : GalleryInfo by galleryInfo

 // Delegating 'Parcelable' is not allowed
@@ -26,7 +26,7 @@ import com.hippo.ehviewer.client.data.GalleryComment;
 import com.hippo.ehviewer.client.data.GalleryCommentList;
 import com.hippo.ehviewer.client.data.GalleryDetail;
 import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.client.data.GalleryInfoImpl;
+import com.hippo.ehviewer.client.data.BaseGalleryInfo;
 import com.hippo.ehviewer.client.data.GalleryTagGroup;
 import com.hippo.ehviewer.client.data.LargePreviewSet;
 import com.hippo.ehviewer.client.data.NormalPreviewSet;
@@ -290,7 +290,7 @@ public class GalleryDetailParser {
                Elements elements = gnd.select("a");
                for (int i = 0; i < elements.size(); i++) {
                    Element element = elements.get(i);
-                    GalleryInfo gi = new GalleryInfoImpl();
+                    GalleryInfo gi = new BaseGalleryInfo();
                    GalleryDetailUrlParser.Result result = GalleryDetailUrlParser.parse(element.attr("href"));
                    if (result != null) {
                        gi.setGid(result.gid);
@@ -24,7 +24,7 @@ import androidx.annotation.NonNull;
 import com.hippo.ehviewer.EhDB;
 import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.client.data.GalleryInfoImpl;
+import com.hippo.ehviewer.client.data.BaseGalleryInfo;
 import com.hippo.ehviewer.client.exception.ParseException;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.JsoupUtils;
@@ -111,7 +111,7 @@ public class GalleryListParser {
    }

    private static GalleryInfo parseGalleryInfo(Element e) {
-        GalleryInfo gi = new GalleryInfoImpl();
+        GalleryInfo gi = new BaseGalleryInfo();

        // Title, gid, token (required), tags
        Element glname = JsoupUtils.getElementByClass(e, "glname");
@@ -2,11 +2,10 @@ package com.hippo.ehviewer.dao

 import androidx.room.ColumnInfo
 import androidx.room.Entity
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfoImpl
+import com.hippo.ehviewer.client.data.BaseGalleryInfo

@Entity(tableName = "BOOKMARKS")
-class BookmarkInfo : GalleryInfoImpl() {
+class BookmarkInfo : BaseGalleryInfo() {
    @JvmField
    @ColumnInfo(name = "PAGE")
    var page = 0
@@ -4,10 +4,10 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Ignore
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfoImpl
+import com.hippo.ehviewer.client.data.BaseGalleryInfo

@Entity(tableName = "DOWNLOADS")
-class DownloadInfo() : GalleryInfoImpl() {
+class DownloadInfo() : BaseGalleryInfo() {
    @JvmField
    @ColumnInfo(name = "STATE")
    var state = 0
@@ -3,10 +3,10 @@ package com.hippo.ehviewer.dao
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfoImpl
+import com.hippo.ehviewer.client.data.BaseGalleryInfo

@Entity(tableName = "HISTORY")
-class HistoryInfo() : GalleryInfoImpl() {
+class HistoryInfo() : BaseGalleryInfo() {
    @JvmField
    @ColumnInfo(name = "TIME")
    var time: Long = 0
@@ -3,10 +3,10 @@ package com.hippo.ehviewer.dao
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfoImpl
+import com.hippo.ehviewer.client.data.BaseGalleryInfo

@Entity(tableName = "LOCAL_FAVORITES")
-class LocalFavoriteInfo() : GalleryInfoImpl() {
+class LocalFavoriteInfo() : BaseGalleryInfo() {
    @JvmField
    @ColumnInfo(name = "TIME")
    var time: Long = 0
@@ -25,7 +25,7 @@ import androidx.annotation.Nullable;

 import com.hippo.ehviewer.EhDB;
 import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.client.data.GalleryInfoImpl;
+import com.hippo.ehviewer.client.data.BaseGalleryInfo;
 import com.hippo.ehviewer.dao.DownloadInfo;
 import com.hippo.ehviewer.dao.DownloadLabel;
 import com.hippo.ehviewer.spider.SpiderDen;
@@ -578,7 +578,7 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener {
        new AsyncTask<Void, Void, Void>() {
            @Override
            protected Void doInBackground(Void... voids) {
-                GalleryInfo galleryInfo = new GalleryInfoImpl();
+                GalleryInfo galleryInfo = new BaseGalleryInfo();
                for (DownloadInfo downloadInfo : list) {
                    galleryInfo.setGid(downloadInfo.getGid());
                    galleryInfo.setToken(downloadInfo.getToken());
@@ -26,8 +26,7 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine.fillGalleryListByApi
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfoImpl
+import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.spider.SpiderInfo
 import com.hippo.ehviewer.spider.SpiderQueen
@@ -164,7 +163,7 @@ class RestoreDownloadPreference constructor(
        }
    }

-    private class RestoreItem : GalleryInfoImpl() {
+    private class RestoreItem : BaseGalleryInfo() {
        var dirname: String? = null
    }
 }