Fix not on FX user thread

Move specialize and globalize VersionSetting to HMCLGameRepository
Fix crash when selectedVersion set to empty string
2018-09-09 19:38:14 +08:00 · 2018-09-09 18:55:01 +08:00 · 2018-09-09 18:35:10 +08:00 · 2018-09-09 18:24:05 +08:00 · 2018-09-08 22:14:06 +08:00
10 changed files with 56 additions and 46 deletions
@@ -20,7 +20,7 @@ import org.tukaani.xz.XZOutputStream
 def buildnumber = System.getenv("BUILD_NUMBER") ?: "SNAPSHOT"
 if (System.getenv("BUILD_NUMBER") != null && System.getenv("BUILD_NUMBER_OFFSET") != null)
    buildnumber = (Integer.parseInt(System.getenv("BUILD_NUMBER")) - Integer.parseInt(System.getenv("BUILD_NUMBER_OFFSET"))).toString()
-def versionroot = System.getenv("VERSION_ROOT") ?: "3.1"
+def versionroot = System.getenv("VERSION_ROOT") ?: "3.2"
 version = versionroot + '.' + buildnumber

 dependencies {
@@ -21,12 +21,14 @@ import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
+import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.*;

 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -37,6 +39,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;

 import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class Launcher extends Application {

@@ -44,6 +47,12 @@ public final class Launcher extends Application {
    public void start(Stage primaryStage) {
        Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);

+        try {
+            ConfigHolder.init();
+        } catch (IOException e) {
+            Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
+        }
+
        try {
            // When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
            // Stage.show() cannot work again because JavaFX Toolkit have already shut down.
@@ -49,12 +49,6 @@ public final class Main {
            return;
        }

-        try {
-            ConfigHolder.init();
-        } catch (IOException e) {
-            showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
-        }
-
        Launcher.main(args);
    }

@@ -100,7 +94,7 @@ public final class Main {
    /**
     * Indicates that a fatal error has occurred, and that the application cannot start.
     */
-    private static void showErrorAndExit(String message) {
+    static void showErrorAndExit(String message) {
        System.err.println(message);
        System.err.println("A fatal error has occurred, forcibly exiting.");
        JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE);
@@ -110,7 +104,7 @@ public final class Main {
    /**
     * Indicates that potential issues have been detected, and that the application may not function properly (but it can still run).
     */
-    private static void showWarningAndContinue(String message) {
+    static void showWarningAndContinue(String message) {
        System.err.println(message);
        System.err.println("Potential issues have been detected.");
        JOptionPane.showMessageDialog(null, message, "Warning", JOptionPane.WARNING_MESSAGE);
@@ -164,6 +164,27 @@ public class HMCLGameRepository extends DefaultGameRepository {
        }
    }

+    /**
+     * Make version use self version settings instead of the global one.
+     * @param id the version id.
+     * @return specialized version setting, null if given version does not exist.
+     */
+    public VersionSetting specializeVersionSetting(String id) {
+        VersionSetting vs = getVersionSetting(id);
+        if (vs == null)
+            vs = createVersionSetting(id);
+        if (vs == null)
+            return null;
+        vs.setUsesGlobal(false);
+        return vs;
+    }
+
+    public void globalizeVersionSetting(String id) {
+        VersionSetting vs = getVersionSetting(id);
+        if (vs != null)
+            vs.setUsesGlobal(true);
+    }
+
    public boolean forbidsVersion(String id) {
        return FORBIDDEN.contains(id);
    }
@@ -87,9 +87,10 @@ public final class ModpackHelper {

        FinalizedCallback finalizeTask = (variables, isDependentsSucceeded) -> {
            if (isDependentsSucceeded) {
-                profile.getRepository().refreshVersions();
-                VersionSetting vs = profile.specializeVersionSetting(name);
-                profile.getRepository().undoMark(name);
+                HMCLGameRepository repository = profile.getRepository();
+                repository.refreshVersions();
+                VersionSetting vs = repository.specializeVersionSetting(name);
+                repository.undoMark(name);
                if (vs != null)
                    vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
            }
@@ -44,7 +44,7 @@ public final class MultiMCInstallVersionSettingTask extends Task {

    @Override
    public void execute() {
-        VersionSetting vs = Objects.requireNonNull(profile.specializeVersionSetting(version));
+        VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
        ModpackHelper.toVersionSetting(manifest, vs);
    }
 }
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.setting;

 import com.google.gson.*;
+import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
@@ -147,7 +148,7 @@ public final class Profile implements Observable {
            Optional<String> version = repository.getVersions().stream().findFirst().map(Version::getId);
            if (version.isPresent())
                selectedVersion.setValue(version.get());
-            else if (StringUtils.isNotBlank(newValue))
+            else if (newValue != null)
                selectedVersion.setValue(null);
        }
    }
@@ -174,32 +175,6 @@ public final class Profile implements Observable {
            return vs;
    }

-    public boolean isVersionGlobal(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        return vs == null || vs.isUsesGlobal();
-    }
-
-    /**
-     * Make version use self version settings instead of the global one.
-     * @param id the version id.
-     * @return specialized version setting, null if given version does not exist.
-     */
-    public VersionSetting specializeVersionSetting(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        if (vs == null)
-            vs = repository.createVersionSetting(id);
-        if (vs == null)
-            return null;
-        vs.setUsesGlobal(false);
-        return vs;
-    }
-
-    public void globalizeVersionSetting(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        if (vs != null)
-            vs.setUsesGlobal(true);
-    }
-
    @Override
    public String toString() {
        return new ToStringBuilder(this)
@@ -230,8 +205,8 @@ public final class Profile implements Observable {
        observableHelper.removeListener(listener);
    }

-    protected void invalidate() {
-        observableHelper.invalidate();
+    private void invalidate() {
+        Platform.runLater(observableHelper::invalidate);
    }

    public static final class Serializer implements JsonSerializer<Profile>, JsonDeserializer<Profile> {
@@ -60,6 +60,7 @@ public class InstallerListPage extends ListPage<InstallerItem> {
                    .start();
        };

+        itemsProperty().clear();
        analyzer.getForge().ifPresent(library -> itemsProperty().add(new InstallerItem("Forge", library.getVersion(), removeAction.apply(library))));
        analyzer.getLiteLoader().ifPresent(library -> itemsProperty().add(new InstallerItem("LiteLoader", library.getVersion(), removeAction.apply(library))));
        analyzer.getOptiFine().ifPresent(library -> itemsProperty().add(new InstallerItem("OptiFine", library.getVersion(), removeAction.apply(library))));
@@ -134,9 +134,9 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
            // because versionSettings can be the global one.
            // global versionSettings.usesGlobal is always true.
            if (newValue)
-                profile.specializeVersionSetting(versionId);
+                profile.getRepository().specializeVersionSetting(versionId);
            else
-                profile.globalizeVersionSetting(versionId);
+                profile.getRepository().globalizeVersionSetting(versionId);

            Platform.runLater(() -> loadVersionSetting(profile, versionId));
        });
@@ -33,8 +33,17 @@ public final class IntVersionNumber extends VersionNumber {
    final List<Integer> version;

    public static boolean isIntVersionNumber(String version) {
-        return version.chars().noneMatch(ch -> ch != '.' && (ch < '0' || ch > '9'))
-                && !version.contains("..") && StringUtils.isNotBlank(version);
+        if (version.chars().noneMatch(ch -> ch != '.' && (ch < '0' || ch > '9'))
+                && !version.contains("..") && StringUtils.isNotBlank(version)) {
+            String[] arr = version.split("\\.");
+            for (String str : arr)
+                if (str.length() > 9)
+                    // Numbers which are larger than 1e9 cannot be stored as integer.
+                    return false;
+            return true;
+        } else {
+            return false;
+        }
    }

    IntVersionNumber(String version) {
Author	SHA1	Message	Date
huangyuhui	5cbde9cc33	Fix not on FX user thread	2018-09-09 19:38:14 +08:00
huangyuhui	25d79a94f8	Move specialize and globalize VersionSetting to HMCLGameRepository	2018-09-09 18:55:01 +08:00
huangyuhui	a5997be9c4	Fix crash when selectedVersion set to empty string	2018-09-09 18:35:10 +08:00
huangyuhui	c679667079	Fix crash when the game version is too long	2018-09-09 18:24:05 +08:00
huangyuhui	6b311c679d	Fixed #446	2018-09-08 22:14:06 +08:00