diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java index c99cc62ea..04ed7e477 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java @@ -12,6 +12,7 @@ public class FormattedLabel extends Label { private final StringProperty format = new SimpleStringProperty(""); private final ObjectProperty arg1 = new SimpleObjectProperty<>(); + private final ObjectProperty arg2 = new SimpleObjectProperty<>(); // add arg2, arg3, ... on demand public FormattedLabel() { @@ -19,11 +20,11 @@ public class FormattedLabel extends Label { } protected StringBinding createStringBinding() { - return Bindings.createStringBinding(this::updateText, format, arg1); + return Bindings.createStringBinding(this::updateText, format, arg1, arg2); } private String updateText() { - return String.format(format.get(), arg1.get()); + return String.format(format.get(), arg1.get(), arg2.get()); } /* Observables */ @@ -51,4 +52,16 @@ public class FormattedLabel extends Label { public void setArg1(Object arg1) { this.arg1.set(arg1); } + + public ObjectProperty arg2Property() { + return arg2; + } + + public Object getArg2() { + return arg2.get(); + } + + public void setArg2(Object arg2) { + this.arg2.set(arg2); + } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java deleted file mode 100644 index 426a6bc4f..000000000 --- a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.cryptomator.ui.controls; - -import javafx.beans.binding.Bindings; -import javafx.beans.binding.StringBinding; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleObjectProperty; - -public class FormattedLabel2 extends FormattedLabel { - - private final ObjectProperty arg2 = new SimpleObjectProperty<>(); - - public FormattedLabel2() { - textProperty().unbind(); - textProperty().bind(createStringBinding2()); - } - - private StringBinding createStringBinding2() { - return Bindings.createStringBinding(this::updateText, formatProperty(), arg1Property(), arg2); - } - - private String updateText() { - return String.format(getFormat(), getArg1(), arg2.get()); - } - - /* Getter & Setter */ - - public ObjectProperty arg2Property() { - return arg2; - } - - public Object getArg2() { - return arg2.get(); - } - - public void setArg2(Object arg2) { - this.arg2.set(arg2); - } - -} diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml index bad05cb7b..58cd0c99d 100644 --- a/main/ui/src/main/resources/fxml/health_check_details.fxml +++ b/main/ui/src/main/resources/fxml/health_check_details.fxml @@ -4,7 +4,6 @@ - - \ No newline at end of file