From 1c7827c53ce547124f0b4cb22085182c7466bc53 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sun, 19 Aug 2018 15:52:14 +0800 Subject: [PATCH] Deprecate and partially remove ImmediateProperty --- .../hmcl/util/ImmediateBooleanProperty.java | 28 +------ .../hmcl/util/ImmediateDoubleProperty.java | 81 ------------------- .../hmcl/util/ImmediateIntegerProperty.java | 28 +------ .../hmcl/util/ImmediateObjectProperty.java | 28 +------ .../hmcl/util/ImmediateStringProperty.java | 3 +- 5 files changed, 8 insertions(+), 160 deletions(-) delete mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateDoubleProperty.java 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 3575d3fed..8425bb875 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateBooleanProperty.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateBooleanProperty.java @@ -21,13 +21,11 @@ import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; -import java.util.Objects; -import java.util.function.Consumer; - /** - * * @author huangyuhui + * @deprecated Use SimpleBooleanProperty instead */ +@Deprecated public class ImmediateBooleanProperty extends SimpleBooleanProperty { @Override @@ -48,31 +46,9 @@ public class ImmediateBooleanProperty extends SimpleBooleanProperty { super.unbind(); } - private Consumer consumer = null; - private ChangeListener listener = null; - - public void setChangedListener(Consumer consumer) { - this.consumer = Objects.requireNonNull(consumer); - this.listener = null; - } - - public void setChangedListener(ChangeListener listener) { - this.consumer = null; - this.listener = Objects.requireNonNull(listener); - } - - public void setChangedListenerAndOperate(Consumer listener) { - setChangedListener(listener); - listener.accept(get()); - } - public ImmediateBooleanProperty(Object bean, String name, boolean initialValue) { super(bean, name, initialValue); ChangeListener changeListener = (a, b, newValue) -> { - if (consumer != null) - consumer.accept(newValue); - if (listener != null) - listener.changed(a, b, newValue); }; addListener(changeListener); } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateDoubleProperty.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateDoubleProperty.java deleted file mode 100644 index a2014317f..000000000 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateDoubleProperty.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2018 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see {http://www.gnu.org/licenses/}. - */ -package org.jackhuang.hmcl.util; - - -import javafx.beans.property.SimpleDoubleProperty; -import javafx.beans.value.ChangeListener; -import javafx.beans.value.ObservableValue; - -import java.util.Objects; -import java.util.function.Consumer; - -/** - * - * @author huangyuhui - */ -public class ImmediateDoubleProperty extends SimpleDoubleProperty { - - @Override - public void set(double newValue) { - super.get(); - super.set(newValue); - } - - @Override - public void bind(ObservableValue newObservable) { - super.get(); - super.bind(newObservable); - } - - @Override - public void unbind() { - super.get(); - super.unbind(); - } - - private Consumer consumer = null; - private ChangeListener listener = null; - - public void setChangedListener(Consumer consumer) { - this.consumer = Objects.requireNonNull(consumer); - this.listener = null; - } - - public void setChangedListener(ChangeListener listener) { - this.consumer = null; - this.listener = Objects.requireNonNull(listener); - } - - public void setChangedListenerAndOperate(Consumer listener) { - setChangedListener(listener); - listener.accept(get()); - } - - public ImmediateDoubleProperty(Object bean, String name, double initialValue) { - super(bean, name, initialValue); - ChangeListener changeListener = (a, b, newValue) -> { - if (consumer != null) - consumer.accept(newValue.doubleValue()); - if (listener != null) - listener.changed(a, b, newValue); - }; - addListener(changeListener); - } -} - 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 d1b1ae0d3..80ee92023 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateIntegerProperty.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateIntegerProperty.java @@ -21,13 +21,11 @@ import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; -import java.util.Objects; -import java.util.function.Consumer; - /** - * * @author huangyuhui + * @deprecated Use SimpleIntegerProperty instead */ +@Deprecated public class ImmediateIntegerProperty extends SimpleIntegerProperty { @Override @@ -48,31 +46,9 @@ public class ImmediateIntegerProperty extends SimpleIntegerProperty { super.unbind(); } - private Consumer consumer = null; - private ChangeListener listener = null; - - public void setChangedListener(Consumer consumer) { - this.consumer = Objects.requireNonNull(consumer); - this.listener = null; - } - - public void setChangedListener(ChangeListener listener) { - this.consumer = null; - this.listener = Objects.requireNonNull(listener); - } - - public void setChangedListenerAndOperate(Consumer listener) { - setChangedListener(listener); - listener.accept(get()); - } - public ImmediateIntegerProperty(Object bean, String name, int initialValue) { super(bean, name, initialValue); ChangeListener changeListener = (a, b, newValue) -> { - if (consumer != null) - consumer.accept(newValue.intValue()); - if (listener != null) - listener.changed(a, b, newValue); }; addListener(changeListener); } 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 42ff4d498..7cfba0cca 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateObjectProperty.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateObjectProperty.java @@ -21,13 +21,11 @@ import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; -import java.util.Objects; -import java.util.function.Consumer; - /** - * * @author huangyuhui + * @deprecated Use SimpleObjectProperty instead */ +@Deprecated public class ImmediateObjectProperty extends SimpleObjectProperty { @Override @@ -48,31 +46,9 @@ public class ImmediateObjectProperty extends SimpleObjectProperty { super.unbind(); } - private Consumer consumer = null; - private ChangeListener listener = null; - - public void setChangedListener(Consumer consumer) { - this.consumer = Objects.requireNonNull(consumer); - this.listener = null; - } - - public void setChangedListener(ChangeListener listener) { - this.consumer = null; - this.listener = Objects.requireNonNull(listener); - } - - public void setChangedListenerAndOperate(Consumer listener) { - setChangedListener(listener); - listener.accept(get()); - } - public ImmediateObjectProperty(Object bean, String name, T initialValue) { super(bean, name, initialValue); ChangeListener changeListener = (a, b, newValue) -> { - if (consumer != null) - consumer.accept(newValue); - if (listener != null) - listener.changed(a, b, newValue); }; addListener(changeListener); } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateStringProperty.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateStringProperty.java index 567385b67..988db96c5 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateStringProperty.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ImmediateStringProperty.java @@ -25,9 +25,10 @@ import java.util.Objects; import java.util.function.Consumer; /** - * * @author huangyuhui + * @deprecated Use SimpleStringProperty instead */ +@Deprecated public class ImmediateStringProperty extends SimpleStringProperty { @Override