From b45907a9f6fd503a0f3978bb229ca770bf65aef3 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sun, 18 Feb 2018 16:23:12 +0800 Subject: [PATCH] =?UTF-8?q?Polish,=20=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jackhuang/hmcl/game/ModpackHelper.java | 2 +- .../java/org/jackhuang/hmcl/setting/Accounts.java | 9 ++++----- .../java/org/jackhuang/hmcl/setting/Settings.java | 2 +- .../org/jackhuang/hmcl/setting/VersionSetting.java | 2 +- .../java/org/jackhuang/hmcl/ui/AccountsPage.java | 14 +++++++------- .../ui/construct/NoneMultipleSelectionModel.java | 8 ++------ .../hmcl/ui/construct/RipplerContainer.java | 8 +++++--- .../hmcl/ui/export/ExportWizardProvider.java | 7 +++++-- .../hmcl/ui/export/ModpackFileSelectionPage.java | 2 +- .../jackhuang/hmcl/upgrade/AppDataUpgrader.java | 2 +- .../org/jackhuang/hmcl/auth/OfflineAccount.java | 1 + 11 files changed, 29 insertions(+), 28 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java index a79a1ebd1..f12f6a861 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java @@ -106,7 +106,7 @@ public final class ModpackHelper { else throw new IllegalStateException("Unrecognized modpack: " + modpack); } - public static Task getUpdateTask(Profile profile, File zipFile, String name, ModpackConfiguration configuration) throws UnsupportedModpackException, MismatchedModpackTypeException, IOException { + public static Task getUpdateTask(Profile profile, File zipFile, String name, ModpackConfiguration configuration) throws UnsupportedModpackException, MismatchedModpackTypeException, IOException { Modpack modpack = ModpackHelper.readModpackManifest(zipFile); switch (configuration.getType()) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java index dccc1d195..a0b8eceed 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java @@ -72,11 +72,10 @@ public final class Accounts { .orElseThrow(() -> new IllegalArgumentException("Account " + account + " has not set current character.")); } - public static Optional getCurrentCharacter(Map storage) { - Optional properties = Lang.get(storage, "properties", Map.class); - if (!properties.isPresent()) return Optional.empty(); - return Lang.get(properties.get(), "character", String.class); - } + public static Optional getCurrentCharacter(Map storage) { + return Lang.get(storage, "properties", Map.class) + .flatMap(properties -> Lang.get(properties, "character", String.class)); + } static String getAccountId(Account account) { return getAccountId(account.getUsername(), getCurrentCharacter(account)); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java index 047d97f7a..7146156ea 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java @@ -69,7 +69,7 @@ public class Settings { { for (Map settings : SETTINGS.getAccounts()) { Optional characterName = Accounts.getCurrentCharacter(settings); - AccountFactory factory = Accounts.ACCOUNT_FACTORY.get(Lang.get(settings, "type", String.class, "")); + AccountFactory factory = Accounts.ACCOUNT_FACTORY.get(Lang.get(settings, "type", String.class, "")); if (factory == null || !characterName.isPresent()) { // unrecognized account type, so remove it. SETTINGS.getAccounts().remove(settings); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java index 6bc4a7c0c..b79465121 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java @@ -138,7 +138,7 @@ public final class VersionSetting { permSizeProperty.set(permSize); } - private final ImmediateIntegerProperty maxMemoryProperty = new ImmediateIntegerProperty(this, "maxMemory", (int) OperatingSystem.SUGGESTED_MEMORY); + private final ImmediateIntegerProperty maxMemoryProperty = new ImmediateIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY); public ImmediateIntegerProperty maxMemoryProperty() { return maxMemoryProperty; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountsPage.java index 5d9c8ac1e..36b7b8ca8 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountsPage.java @@ -214,19 +214,19 @@ public final class AccountsPage extends StackPane implements DecoratorPage { this.title.set(title); } - public static String accountException(Exception account) { - if (account instanceof InvalidCredentialsException) { + public static String accountException(Exception exception) { + if (exception instanceof InvalidCredentialsException) { return Main.i18n("account.failed.invalid_credentials"); - } else if (account instanceof NoCharacterException) { + } else if (exception instanceof NoCharacterException) { return Main.i18n("account.failed.no_charactor"); - } else if (account instanceof ServerDisconnectException) { + } else if (exception instanceof ServerDisconnectException) { return Main.i18n("account.failed.connect_authentication_server"); - } else if (account instanceof InvalidTokenException) { + } else if (exception instanceof InvalidTokenException) { return Main.i18n("account.failed.invalid_token"); - } else if (account instanceof InvalidPasswordException) { + } else if (exception instanceof InvalidPasswordException) { return Main.i18n("account.failed.invalid_password"); } else { - return account.getClass() + ": " + ((Exception) account).getLocalizedMessage(); + return exception.getClass() + ": " + exception.getLocalizedMessage(); } } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/NoneMultipleSelectionModel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/NoneMultipleSelectionModel.java index 91418fbbc..c91691ae4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/NoneMultipleSelectionModel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/NoneMultipleSelectionModel.java @@ -21,13 +21,9 @@ import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.scene.control.MultipleSelectionModel; -public final class NoneMultipleSelectionModel extends MultipleSelectionModel { - private static final NoneMultipleSelectionModel INSTANCE = new NoneMultipleSelectionModel(); - private NoneMultipleSelectionModel() {} +public class NoneMultipleSelectionModel extends MultipleSelectionModel { - @SuppressWarnings("unchecked") - public static NoneMultipleSelectionModel getInstance() { - return (NoneMultipleSelectionModel) INSTANCE; + public NoneMultipleSelectionModel() { } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java index 0f91804c9..d50a5f2d3 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java @@ -217,11 +217,13 @@ public class RipplerContainer extends StackPane { private static class StyleableProperties { private static final CssMetaData RIPPLER_FILL = new CssMetaData("-jfx-rippler-fill", StyleConverter.getPaintConverter(), Color.rgb(0, 200, 255)) { - public boolean isSettable(RipplerContainer control) { + @Override + public boolean isSettable(RipplerContainer control) { return control.ripplerFill == null || !control.ripplerFill.isBound(); } - public StyleableProperty getStyleableProperty(RipplerContainer control) { + @Override + public StyleableProperty getStyleableProperty(RipplerContainer control) { return control.ripplerFillProperty(); } }; @@ -232,7 +234,7 @@ public class RipplerContainer extends StackPane { } static { - List> styleables = new ArrayList<>(Parent.getClassCssMetaData()); + List> styleables = new ArrayList<>(Node.getClassCssMetaData()); Collections.addAll(styleables, RIPPLER_FILL); STYLEABLES = Collections.unmodifiableList(styleables); } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java index 5fdb9c969..362395e6d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java @@ -44,8 +44,11 @@ public final class ExportWizardProvider implements WizardProvider { @Override public Object finish(Map settings) { - return new HMCLModpackExportTask(profile.getRepository(), version, (List) settings.get(ModpackFileSelectionPage.MODPACK_FILE_SELECTION), - new Modpack( + @SuppressWarnings("unchecked") + List whitelist = (List) settings.get(ModpackFileSelectionPage.MODPACK_FILE_SELECTION); + + return new HMCLModpackExportTask(profile.getRepository(), version, whitelist, + new Modpack( (String) settings.get(ModpackInfoPage.MODPACK_NAME), (String) settings.get(ModpackInfoPage.MODPACK_AUTHOR), (String) settings.get(ModpackInfoPage.MODPACK_VERSION), diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java index ee0dbfcad..1f8f1e025 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java @@ -62,7 +62,7 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP FXUtils.loadFXML(this, "/assets/fxml/modpack/selection.fxml"); rootNode = getTreeItem(profile.getRepository().getRunDirectory(version), "minecraft"); treeView.setRoot(rootNode); - treeView.setSelectionModel(NoneMultipleSelectionModel.getInstance()); + treeView.setSelectionModel(new NoneMultipleSelectionModel<>()); } private CheckBoxTreeItem getTreeItem(File file, String basePath) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java index 8d36d8e25..a7e60e87f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java @@ -56,7 +56,7 @@ public class AppDataUpgrader extends IUpgrader { al.add("--noupdate"); AccessController.doPrivileged((PrivilegedExceptionAction) () -> { new URLClassLoader(new URL[]{jar.toURI().toURL()}, - URLClassLoader.getSystemClassLoader().getParent()).loadClass(mainClass) + ClassLoader.getSystemClassLoader().getParent()).loadClass(mainClass) .getMethod("main", String[].class).invoke(null, new Object[]{al.toArray(new String[0])}); return null; }); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/OfflineAccount.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/OfflineAccount.java index 8090c9401..f3c65e610 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/OfflineAccount.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/OfflineAccount.java @@ -47,6 +47,7 @@ public class OfflineAccount extends Account { throw new IllegalArgumentException("Username cannot be blank"); } + @Override public UUID getUUID() { return UUIDTypeAdapter.fromString(uuid); }