Merge remote-tracking branch 'refs/remotes/burningtnt/fix3099/auto-in…

…stall-page' into prs
burningtnt · Jul 22, 2024 · 3cf721d · 3cf721d
2 parents 8755e0e + bd22cb0
commit 3cf721d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java
@@ -64,9 +64,6 @@ public class InstallerItem extends Control {
     private final ObjectProperty<EventHandler<? super MouseEvent>> removeActionProperty = new SimpleObjectProperty<>(this, "removeAction");
 
     public interface State {
-        IllegalStateException SEALED = new IllegalStateException(
-                "Interface org.jackhuang.hmcl.ui.InstallerItem.State is sealed, whose implementations should ONLY be: org.jackhuang.hmcl.ui.InstallerItem.InstallableState, org.jackhuang.hmcl.ui.InstallerItem.IncompatibleState and org.jackhuang.hmcl.ui.InstallerItem.InstalledState. Are you adding more implementation?"
-        );
     }
 
     public static final class InstallableState implements State {
@@ -78,7 +75,6 @@ private InstallableState() {
 
     public static final class IncompatibleState implements State {
         private final String incompatibleItemName;
-
         private final String incompatibleItemVersion;
 
         public IncompatibleState(String incompatibleItemName, String incompatibleItemVersion) {
@@ -97,9 +93,7 @@ public String getIncompatibleItemVersion() {
 
     public static final class InstalledState implements State {
         private final String version;
-
         private final boolean external;
-
         private final boolean incompatibleWithGame;
 
         public InstalledState(String version, boolean external, boolean incompatibleWithGame) {
@@ -172,7 +166,7 @@ public ObjectProperty<InstalledState> versionProperty() {
         return versionProperty;
     }
 
-    public ObjectProperty<State> resolvedStatePropery() {
+    public ObjectProperty<State> resolvedStateProperty() {
         return resolvedStateProperty;
     }
 
@@ -293,7 +287,7 @@ public InstallerItem[] getLibraries() {
         }
     }
 
-    public static class InstallerItemSkin extends SkinBase<InstallerItem> {
+    private static final class InstallerItemSkin extends SkinBase<InstallerItem> {
         private static final PseudoClass LIST_ITEM = PseudoClass.getPseudoClass("list-item");
         private static final PseudoClass CARD = PseudoClass.getPseudoClass("card");
         private static final WeakListenerHolder holder = new WeakListenerHolder();
@@ -356,7 +350,7 @@ public static class InstallerItemSkin extends SkinBase<InstallerItem> {
                 } else if (state instanceof IncompatibleState) {
                     return i18n("install.installer.incompatible", i18n("install.installer." + ((IncompatibleState) state).incompatibleItemName));
                 } else {
-                    throw State.SEALED;
+                    throw new AssertionError("Unknown state type: " + state.getClass());
                 }
             }, control.resolvedStateProperty));
             BorderPane.setMargin(statusLabel, new Insets(0, 0, 0, 8));

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java
@@ -71,7 +71,7 @@ public InstallersPage(WizardController controller, HMCLGameRepository repository
                     Controllers.dialog(i18n("install.installer.fabric-api.warning"), i18n("message.warning"), MessageDialogPane.MessageType.WARNING);
                 }
 
-                if (!(library.resolvedStatePropery().get() instanceof InstallerItem.IncompatibleState))
+                if (!(library.resolvedStateProperty().get() instanceof InstallerItem.IncompatibleState))
                     controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer." + libraryId)), gameVersion, downloadProvider, libraryId, () -> controller.onPrev(false)));
             });
             library.removeActionProperty().set(e -> {