mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-19 00:56:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

use jfx19 API

Browse Source
This commit is contained in:
Armin Schrenk
2022-11-30 16:23:44 +01:00
parent 348bc2b2ec
commit 792fe1eafe
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/cryptomator/ui/health/ResultListCellController.java
View File

@@ -33,7 +33,6 @@ public class ResultListCellController implements FxController {
private static final FontAwesome5Icon WARN_ICON = FontAwesome5Icon.EXCLAMATION_TRIANGLE;
private static final FontAwesome5Icon CRIT_ICON = FontAwesome5Icon.TIMES;
private final Logger LOG = LoggerFactory.getLogger(ResultListCellController.class);
private final ObjectProperty<Result> result;
private final ObservableValue<DiagnosticResult.Severity> severity;
@@ -41,12 +40,12 @@ public class ResultListCellController implements FxController {
private final ResultFixApplier fixApplier;
private final ObservableValue<Result.FixState> fixState;
private final ObjectBinding<FontAwesome5Icon> severityGlyph;
private final ObjectBinding<FontAwesome5Icon> fixGlyph;
private final BooleanBinding fixable;
private final BooleanBinding fixing;
private final BooleanBinding fixed;
private final BooleanBinding fixFailed;
private final BooleanBinding fixRunningOrDone;
private final ObservableValue<FontAwesome5Icon> fixGlyph;
private final List<Subscription> subscriptions;
private final Tooltip fixStateTip;
private final Tooltip severityTip;
@@ -66,12 +65,12 @@ public class ResultListCellController implements FxController {
this.fixApplier = fixApplier;
this.fixState = result.flatMap(Result::fixState);
this.severityGlyph = Bindings.createObjectBinding(this::getSeverityGlyph, result);
this.fixGlyph = Bindings.createObjectBinding(this::getFixGlyph, fixState);
this.fixable = Bindings.createBooleanBinding(this::isFixable, fixState);
this.fixing = Bindings.createBooleanBinding(this::isFixing, fixState);
this.fixed = Bindings.createBooleanBinding(this::isFixed, fixState);
this.fixFailed = Bindings.createBooleanBinding(this::isFixFailed, fixState);
this.fixRunningOrDone = fixing.or(fixed).or(fixFailed);
this.fixGlyph = fixState.map(this::getFixGlyph);
this.subscriptions = new ArrayList<>();
this.fixStateTip = new Tooltip();
@@ -83,6 +82,15 @@ public class ResultListCellController implements FxController {
severityTip.setShowDelay(Duration.millis(150));
}
public FontAwesome5Icon getFixGlyph(Result.FixState state) {
return switch (state) {
case FIXING -> FontAwesome5Icon.SPINNER;
case FIXED -> FontAwesome5Icon.CHECK;
case FIX_FAILED -> FontAwesome5Icon.TIMES;
default -> null;
};
}
private String getFixStateDescription(Result.FixState fixState) {
return switch (fixState) {
case FIXED -> resourceBundle.getString("health.fix.successTip");
@@ -170,22 +178,10 @@ public class ResultListCellController implements FxController {
};
}
public ObjectBinding<FontAwesome5Icon> fixGlyphProperty() {
public ObservableValue<FontAwesome5Icon> fixGlyphProperty() {
return fixGlyph;
}
public FontAwesome5Icon getFixGlyph() {
if (fixState.getValue() == null) {
return null;
}
return switch (fixState.getValue()) {
case NOT_FIXABLE, FIXABLE -> null;
case FIXING -> FontAwesome5Icon.SPINNER;
case FIXED -> FontAwesome5Icon.CHECK;
case FIX_FAILED -> FontAwesome5Icon.TIMES;
};
}
public BooleanBinding fixableProperty() {
return fixable;
}