mirror of
https://github.com/HMCL-dev/HMCL.git
synced 2025-09-15 23:06:07 -04:00
Deprecate and partially remove ImmediateProperty
This commit is contained in:
parent
9512bdb5d6
commit
1c7827c53c
@ -21,13 +21,11 @@ import javafx.beans.property.SimpleBooleanProperty;
|
|||||||
import javafx.beans.value.ChangeListener;
|
import javafx.beans.value.ChangeListener;
|
||||||
import javafx.beans.value.ObservableValue;
|
import javafx.beans.value.ObservableValue;
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* @author huangyuhui
|
* @author huangyuhui
|
||||||
|
* @deprecated Use SimpleBooleanProperty instead
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public class ImmediateBooleanProperty extends SimpleBooleanProperty {
|
public class ImmediateBooleanProperty extends SimpleBooleanProperty {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -48,31 +46,9 @@ public class ImmediateBooleanProperty extends SimpleBooleanProperty {
|
|||||||
super.unbind();
|
super.unbind();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Consumer<Boolean> consumer = null;
|
|
||||||
private ChangeListener<Boolean> listener = null;
|
|
||||||
|
|
||||||
public void setChangedListener(Consumer<Boolean> consumer) {
|
|
||||||
this.consumer = Objects.requireNonNull(consumer);
|
|
||||||
this.listener = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChangedListener(ChangeListener<Boolean> listener) {
|
|
||||||
this.consumer = null;
|
|
||||||
this.listener = Objects.requireNonNull(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChangedListenerAndOperate(Consumer<Boolean> listener) {
|
|
||||||
setChangedListener(listener);
|
|
||||||
listener.accept(get());
|
|
||||||
}
|
|
||||||
|
|
||||||
public ImmediateBooleanProperty(Object bean, String name, boolean initialValue) {
|
public ImmediateBooleanProperty(Object bean, String name, boolean initialValue) {
|
||||||
super(bean, name, initialValue);
|
super(bean, name, initialValue);
|
||||||
ChangeListener<Boolean> changeListener = (a, b, newValue) -> {
|
ChangeListener<Boolean> changeListener = (a, b, newValue) -> {
|
||||||
if (consumer != null)
|
|
||||||
consumer.accept(newValue);
|
|
||||||
if (listener != null)
|
|
||||||
listener.changed(a, b, newValue);
|
|
||||||
};
|
};
|
||||||
addListener(changeListener);
|
addListener(changeListener);
|
||||||
}
|
}
|
||||||
|
@ -1,81 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2018 huangyuhui <huanghongxun2008@126.com>
|
|
||||||
*
|
|
||||||
* 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<? extends Number> newObservable) {
|
|
||||||
super.get();
|
|
||||||
super.bind(newObservable);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void unbind() {
|
|
||||||
super.get();
|
|
||||||
super.unbind();
|
|
||||||
}
|
|
||||||
|
|
||||||
private Consumer<Double> consumer = null;
|
|
||||||
private ChangeListener<Number> listener = null;
|
|
||||||
|
|
||||||
public void setChangedListener(Consumer<Double> consumer) {
|
|
||||||
this.consumer = Objects.requireNonNull(consumer);
|
|
||||||
this.listener = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChangedListener(ChangeListener<Number> listener) {
|
|
||||||
this.consumer = null;
|
|
||||||
this.listener = Objects.requireNonNull(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChangedListenerAndOperate(Consumer<Double> listener) {
|
|
||||||
setChangedListener(listener);
|
|
||||||
listener.accept(get());
|
|
||||||
}
|
|
||||||
|
|
||||||
public ImmediateDoubleProperty(Object bean, String name, double initialValue) {
|
|
||||||
super(bean, name, initialValue);
|
|
||||||
ChangeListener<Number> changeListener = (a, b, newValue) -> {
|
|
||||||
if (consumer != null)
|
|
||||||
consumer.accept(newValue.doubleValue());
|
|
||||||
if (listener != null)
|
|
||||||
listener.changed(a, b, newValue);
|
|
||||||
};
|
|
||||||
addListener(changeListener);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -21,13 +21,11 @@ import javafx.beans.property.SimpleIntegerProperty;
|
|||||||
import javafx.beans.value.ChangeListener;
|
import javafx.beans.value.ChangeListener;
|
||||||
import javafx.beans.value.ObservableValue;
|
import javafx.beans.value.ObservableValue;
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* @author huangyuhui
|
* @author huangyuhui
|
||||||
|
* @deprecated Use SimpleIntegerProperty instead
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public class ImmediateIntegerProperty extends SimpleIntegerProperty {
|
public class ImmediateIntegerProperty extends SimpleIntegerProperty {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -48,31 +46,9 @@ public class ImmediateIntegerProperty extends SimpleIntegerProperty {
|
|||||||
super.unbind();
|
super.unbind();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Consumer<Integer> consumer = null;
|
|
||||||
private ChangeListener<Number> listener = null;
|
|
||||||
|
|
||||||
public void setChangedListener(Consumer<Integer> consumer) {
|
|
||||||
this.consumer = Objects.requireNonNull(consumer);
|
|
||||||
this.listener = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChangedListener(ChangeListener<Number> listener) {
|
|
||||||
this.consumer = null;
|
|
||||||
this.listener = Objects.requireNonNull(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChangedListenerAndOperate(Consumer<Integer> listener) {
|
|
||||||
setChangedListener(listener);
|
|
||||||
listener.accept(get());
|
|
||||||
}
|
|
||||||
|
|
||||||
public ImmediateIntegerProperty(Object bean, String name, int initialValue) {
|
public ImmediateIntegerProperty(Object bean, String name, int initialValue) {
|
||||||
super(bean, name, initialValue);
|
super(bean, name, initialValue);
|
||||||
ChangeListener<Number> changeListener = (a, b, newValue) -> {
|
ChangeListener<Number> changeListener = (a, b, newValue) -> {
|
||||||
if (consumer != null)
|
|
||||||
consumer.accept(newValue.intValue());
|
|
||||||
if (listener != null)
|
|
||||||
listener.changed(a, b, newValue);
|
|
||||||
};
|
};
|
||||||
addListener(changeListener);
|
addListener(changeListener);
|
||||||
}
|
}
|
||||||
|
@ -21,13 +21,11 @@ import javafx.beans.property.SimpleObjectProperty;
|
|||||||
import javafx.beans.value.ChangeListener;
|
import javafx.beans.value.ChangeListener;
|
||||||
import javafx.beans.value.ObservableValue;
|
import javafx.beans.value.ObservableValue;
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* @author huangyuhui
|
* @author huangyuhui
|
||||||
|
* @deprecated Use SimpleObjectProperty instead
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public class ImmediateObjectProperty<T> extends SimpleObjectProperty<T> {
|
public class ImmediateObjectProperty<T> extends SimpleObjectProperty<T> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -48,31 +46,9 @@ public class ImmediateObjectProperty<T> extends SimpleObjectProperty<T> {
|
|||||||
super.unbind();
|
super.unbind();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Consumer<T> consumer = null;
|
|
||||||
private ChangeListener<T> listener = null;
|
|
||||||
|
|
||||||
public void setChangedListener(Consumer<T> consumer) {
|
|
||||||
this.consumer = Objects.requireNonNull(consumer);
|
|
||||||
this.listener = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChangedListener(ChangeListener<T> listener) {
|
|
||||||
this.consumer = null;
|
|
||||||
this.listener = Objects.requireNonNull(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChangedListenerAndOperate(Consumer<T> listener) {
|
|
||||||
setChangedListener(listener);
|
|
||||||
listener.accept(get());
|
|
||||||
}
|
|
||||||
|
|
||||||
public ImmediateObjectProperty(Object bean, String name, T initialValue) {
|
public ImmediateObjectProperty(Object bean, String name, T initialValue) {
|
||||||
super(bean, name, initialValue);
|
super(bean, name, initialValue);
|
||||||
ChangeListener<T> changeListener = (a, b, newValue) -> {
|
ChangeListener<T> changeListener = (a, b, newValue) -> {
|
||||||
if (consumer != null)
|
|
||||||
consumer.accept(newValue);
|
|
||||||
if (listener != null)
|
|
||||||
listener.changed(a, b, newValue);
|
|
||||||
};
|
};
|
||||||
addListener(changeListener);
|
addListener(changeListener);
|
||||||
}
|
}
|
||||||
|
@ -25,9 +25,10 @@ import java.util.Objects;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* @author huangyuhui
|
* @author huangyuhui
|
||||||
|
* @deprecated Use SimpleStringProperty instead
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public class ImmediateStringProperty extends SimpleStringProperty {
|
public class ImmediateStringProperty extends SimpleStringProperty {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
x
Reference in New Issue
Block a user