创建 ObservableSetting 辅助类 (#4719)

Author: Glavo

HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java

@@ -20,7 +20,6 @@
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
-import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
@@ -38,18 +37,15 @@
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.gson.*;
 import org.jackhuang.hmcl.util.i18n.SupportedLocale;
-import org.jackhuang.hmcl.util.javafx.DirtyTracker;
-import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.invoke.MethodHandles;
 import java.lang.reflect.*;
 import java.net.Proxy;
 import java.nio.file.Path;
 import java.util.*;
 
 @JsonAdapter(value = Config.Adapter.class)
-public final class Config implements Observable {
+public final class Config extends ObservableSetting {
 
     public static final int CURRENT_VERSION = 2;
     public static final int CURRENT_UI_VERSION = 0;
@@ -67,54 +63,15 @@ public final class Config implements Observable {
             .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
             .create();
 
-    private static final List<ObservableField<Config>> FIELDS;
-
-    static {
-        final MethodHandles.Lookup lookup = MethodHandles.lookup();
-        Field[] fields = Config.class.getDeclaredFields();
-
-        var configFields = new ArrayList<ObservableField<Config>>(fields.length);
-        for (Field field : fields) {
-            int modifiers = field.getModifiers();
-            if (Modifier.isTransient(modifiers) || Modifier.isStatic(modifiers))
-                continue;
-
-            configFields.add(ObservableField.of(lookup, field));
-        }
-        FIELDS = List.copyOf(configFields);
-    }
-
     @Nullable
     public static Config fromJson(String json) throws JsonParseException {
         return CONFIG_GSON.fromJson(json, Config.class);
     }
 
-    private transient final ObservableHelper helper = new ObservableHelper(this);
-    private transient final DirtyTracker tracker = new DirtyTracker();
-    private transient final Map<String, JsonElement> unknownFields = new HashMap<>();
-
     public Config() {
-        var shouldBeWrite = Collections.<Observable>newSetFromMap(new IdentityHashMap<>());
-        Collections.addAll(shouldBeWrite, configVersion, uiVersion);
-
-        for (var field : FIELDS) {
-            Observable observable = field.get(this);
-            if (shouldBeWrite.contains(observable))
-                tracker.markDirty(observable);
-            else
-                tracker.track(observable);
-            observable.addListener(helper);
-        }
-    }
-
-    @Override
-    public void addListener(InvalidationListener listener) {
-        helper.addListener(listener);
-    }
-
-    @Override
-    public void removeListener(InvalidationListener listener) {
-        helper.removeListener(listener);
+        tracker.markDirty(configVersion);
+        tracker.markDirty(uiVersion);
+        register();
     }
 
     public String toJson() {
@@ -775,53 +732,10 @@ public MapProperty<String, Profile> getConfigurations() {
         return configurations;
     }
 
-    public static final class Adapter implements JsonSerializer<Config>, JsonDeserializer<Config> {
-
-        @Override
-        public JsonElement serialize(Config config, Type typeOfSrc, JsonSerializationContext context) {
-            if (config == null)
-                return JsonNull.INSTANCE;
-
-            JsonObject result = new JsonObject();
-            for (var field : FIELDS) {
-                Observable observable = field.get(config);
-                if (config.tracker.isDirty(observable)) {
-                    field.serialize(result, config, context);
-                }
-            }
-            config.unknownFields.forEach(result::add);
-            return result;
-        }
-
+    public static final class Adapter extends ObservableSetting.Adapter<Config> {
         @Override
-        public Config deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (json == null || json.isJsonNull())
-                return null;
-
-            if (!json.isJsonObject())
-                throw new JsonParseException("Config is not an object: " + json);
-
-            Config config = new Config();
-
-            var values = new LinkedHashMap<>(json.getAsJsonObject().asMap());
-            for (ObservableField<Config> field : FIELDS) {
-                JsonElement value = values.remove(field.getSerializedName());
-                if (value == null) {
-                    for (String alternateName : field.getAlternateNames()) {
-                        value = values.remove(alternateName);
-                        if (value != null)
-                            break;
-                    }
-                }
-
-                if (value != null) {
-                    config.tracker.markDirty(field.get(config));
-                    field.deserialize(config, value, context);
-                }
-            }
-
-            config.unknownFields.putAll(values);
-            return config;
+        protected Config createInstance() {
+            return new Config();
         }
     }
 }