From e9b816fb87e4bc2115e5528c18706275752c11cc Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sun, 18 Feb 2018 15:15:28 +0800 Subject: [PATCH] Change Lang.EMPTY_CONSUMER to emptyConsumer() --- .../org/jackhuang/hmcl/util/ImmediateBooleanProperty.java | 2 +- .../org/jackhuang/hmcl/util/ImmediateDoubleProperty.java | 2 +- .../org/jackhuang/hmcl/util/ImmediateIntegerProperty.java | 2 +- .../org/jackhuang/hmcl/util/ImmediateObjectProperty.java | 2 +- HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateBooleanProperty.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateBooleanProperty.java index af637d310..63b6edf85 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateBooleanProperty.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateBooleanProperty.java @@ -48,7 +48,7 @@ public class ImmediateBooleanProperty extends SimpleBooleanProperty { super.unbind(); } - private Consumer listener = Lang.EMPTY_CONSUMER; + private Consumer listener = Lang.emptyConsumer(); private final ChangeListener changeListener = (a, b, newValue) -> listener.accept(newValue); public void setChangedListener(Consumer listener) { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateDoubleProperty.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateDoubleProperty.java index eb63b057d..2568c7c2f 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateDoubleProperty.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateDoubleProperty.java @@ -49,7 +49,7 @@ public class ImmediateDoubleProperty extends SimpleDoubleProperty { super.unbind(); } - private Consumer listener = Lang.EMPTY_CONSUMER; + private Consumer listener = Lang.emptyConsumer(); private final ChangeListener changeListener = (a, b, newValue) -> listener.accept(newValue.doubleValue()); public void setChangedListener(Consumer listener) { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateIntegerProperty.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateIntegerProperty.java index 485c2f0be..2e5d8be18 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateIntegerProperty.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateIntegerProperty.java @@ -48,7 +48,7 @@ public class ImmediateIntegerProperty extends SimpleIntegerProperty { super.unbind(); } - private Consumer listener = Lang.EMPTY_CONSUMER; + private Consumer listener = Lang.emptyConsumer(); private final ChangeListener changeListener = (a, b, newValue) -> listener.accept(newValue.intValue()); public void setChangedListener(Consumer listener) { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateObjectProperty.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateObjectProperty.java index 54361523e..8c565cb92 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateObjectProperty.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateObjectProperty.java @@ -48,7 +48,7 @@ public class ImmediateObjectProperty extends SimpleObjectProperty { super.unbind(); } - private Consumer listener = Lang.EMPTY_CONSUMER; + private Consumer listener = Lang.emptyConsumer(); private final ChangeListener changeListener = (a, b, newValue) -> listener.accept(newValue); public void setChangedListener(Consumer listener) { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java index c41211ed9..9ff2e8554 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java @@ -22,8 +22,9 @@ public final class Lang { private Lang() { } - public static final Consumer EMPTY_CONSUMER = a -> { - }; + public static Consumer emptyConsumer() { + return x -> {}; + } public static T requireJsonNonNull(T obj) throws JsonParseException { return requireJsonNonNull(obj, "Json object cannot be null.");