From a5f3ec7b9bc75321dfd9521eb32b04d49c8dbf86 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sun, 18 Feb 2018 17:07:54 +0800 Subject: [PATCH] fix indents --- .../org/jackhuang/hmcl/setting/Accounts.java | 8 +-- .../java/org/jackhuang/hmcl/ui/FXUtils.java | 52 +++++++++---------- .../construct/NoneMultipleSelectionModel.java | 2 +- .../hmcl/ui/construct/RipplerContainer.java | 4 +- .../hmcl/ui/export/ExportWizardProvider.java | 8 +-- 5 files changed, 37 insertions(+), 37 deletions(-) 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 a0b8eceed..e12700207 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java @@ -72,10 +72,10 @@ public final class Accounts { .orElseThrow(() -> new IllegalArgumentException("Account " + account + " has not set current character.")); } - public static Optional getCurrentCharacter(Map storage) { - return Lang.get(storage, "properties", Map.class) - .flatMap(properties -> Lang.get(properties, "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/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java index d58db81c9..8eef22adc 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java @@ -94,37 +94,37 @@ public final class FXUtils { }); } - private static class ListenerPair { - ObservableValue value; - ChangeListener listener; + private static class ListenerPair { + ObservableValue value; + ChangeListener listener; - ListenerPair(ObservableValue value, ChangeListener listener) { - this.value = value; - this.listener = listener; - } + ListenerPair(ObservableValue value, ChangeListener listener) { + this.value = value; + this.listener = listener; + } - void bind() { - value.addListener(listener); - } + void bind() { + value.addListener(listener); + } - void unbind() { - value.removeListener(listener); - } - } + void unbind() { + value.removeListener(listener); + } + } - public static void addListener(Node node, String key, ObservableValue value, Consumer callback) { - ListenerPair pair = new ListenerPair<>(value, (a, b, newValue) -> callback.accept(newValue)); - node.getProperties().put(key, pair); - pair.bind(); - } + public static void addListener(Node node, String key, ObservableValue value, Consumer callback) { + ListenerPair pair = new ListenerPair<>(value, (a, b, newValue) -> callback.accept(newValue)); + node.getProperties().put(key, pair); + pair.bind(); + } - public static void removeListener(Node node, String key) { - Lang.convert(node.getProperties().get(key), ListenerPair.class) - .ifPresent(info -> { - info.unbind(); - node.getProperties().remove(key); - }); - } + public static void removeListener(Node node, String key) { + Lang.convert(node.getProperties().get(key), ListenerPair.class) + .ifPresent(info -> { + info.unbind(); + node.getProperties().remove(key); + }); + } public static void setValidateWhileTextChanged(Node field, boolean validate) { if (field instanceof JFXTextField) { 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 c91691ae4..cbebe3e2c 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 @@ -23,7 +23,7 @@ import javafx.scene.control.MultipleSelectionModel; public class NoneMultipleSelectionModel extends MultipleSelectionModel { - public NoneMultipleSelectionModel() { + 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 d50a5f2d3..df7073f5a 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 @@ -218,12 +218,12 @@ public class RipplerContainer extends StackPane { private static final CssMetaData RIPPLER_FILL = new CssMetaData("-jfx-rippler-fill", StyleConverter.getPaintConverter(), Color.rgb(0, 200, 255)) { @Override - public boolean isSettable(RipplerContainer control) { + public boolean isSettable(RipplerContainer control) { return control.ripplerFill == null || !control.ripplerFill.isBound(); } @Override - public StyleableProperty getStyleableProperty(RipplerContainer control) { + public StyleableProperty getStyleableProperty(RipplerContainer control) { return control.ripplerFillProperty(); } }; 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 362395e6d..8686237bf 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,11 +44,11 @@ public final class ExportWizardProvider implements WizardProvider { @Override public Object finish(Map settings) { - @SuppressWarnings("unchecked") - List whitelist = (List) settings.get(ModpackFileSelectionPage.MODPACK_FILE_SELECTION); + @SuppressWarnings("unchecked") + List whitelist = (List) settings.get(ModpackFileSelectionPage.MODPACK_FILE_SELECTION); - return new HMCLModpackExportTask(profile.getRepository(), version, whitelist, - new Modpack( + 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),