From 95f404bb6421e5ea8b727afc49333abe8e4ac1e0 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sun, 18 Feb 2018 15:20:00 +0800 Subject: [PATCH] move emptyConsumer() to Constants --- HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java | 4 ++++ .../org/jackhuang/hmcl/util/ImmediateBooleanProperty.java | 2 +- .../java/org/jackhuang/hmcl/util/ImmediateDoubleProperty.java | 2 +- .../org/jackhuang/hmcl/util/ImmediateIntegerProperty.java | 2 +- .../java/org/jackhuang/hmcl/util/ImmediateObjectProperty.java | 2 +- HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java | 4 ---- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java index 08ac96a2e..5526708e6 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java @@ -94,4 +94,8 @@ public final class Constants { public static Predicate falsePredicate() { return s -> false; } + + public static Consumer emptyConsumer() { + return x -> {}; + } } 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 63b6edf85..54ca83039 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.emptyConsumer(); + private Consumer listener = Constants.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 2568c7c2f..f6937c132 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.emptyConsumer(); + private Consumer listener = Constants.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 2e5d8be18..49c4dea81 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.emptyConsumer(); + private Consumer listener = Constants.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 8c565cb92..d18f2c559 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.emptyConsumer(); + private Consumer listener = Constants.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 0a44f5562..96486d321 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java @@ -22,10 +22,6 @@ public final class Lang { private Lang() { } - public static Consumer emptyConsumer() { - return x -> {}; - } - public static T requireJsonNonNull(T obj) throws JsonParseException { return requireJsonNonNull(obj, "Json object cannot be null."); }