mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-22 18:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

delocalize check names

Browse Source
This commit is contained in:
Armin Schrenk
2021-07-19 16:45:10 +02:00
parent 38c4b3c4a3
commit f907e2d033
5 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/cryptomator/ui/health/Check.java
View File

@@ -11,15 +11,12 @@ import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
public class Check {
private static final String LOCALIZE_PREFIX = "health.";
private final HealthCheck check;
private final ResourceBundle resourceBundle;
private final BooleanProperty chosenForExecution = new SimpleBooleanProperty(false);
private final ObjectProperty<CheckState> state = new SimpleObjectProperty<>(CheckState.RUNNABLE);
@@ -28,17 +25,12 @@ public class Check {
private final ObjectProperty<Throwable> error = new SimpleObjectProperty<>(null);
private final BooleanBinding isInReRunState = state.isNotEqualTo(CheckState.RUNNING).or(state.isNotEqualTo(CheckState.SCHEDULED));
Check(HealthCheck check, ResourceBundle resourceBundle) {
Check(HealthCheck check) {
this.check = check;
this.resourceBundle = resourceBundle;
}
String getLocalizedName() {
try {
return resourceBundle.getString(LOCALIZE_PREFIX+check.name());
} catch (MissingResourceException e){
return check.name();
}
String getName() {
return check.name();
}
HealthCheck getHealthCheck() {

3
src/main/java/org/cryptomator/ui/health/CheckDetailController.java
View File

@@ -3,7 +3,6 @@ package org.cryptomator.ui.health;
import com.tobiasdiez.easybind.EasyBind;
import com.tobiasdiez.easybind.EasyObservableList;
import com.tobiasdiez.easybind.Subscription;
import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
import com.tobiasdiez.easybind.optional.OptionalBinding;
import org.cryptomator.cryptofs.health.api.DiagnosticResult;
import org.cryptomator.ui.common.FxController;
@@ -46,7 +45,7 @@ public class CheckDetailController implements FxController {
this.results = EasyBind.wrapList(FXCollections.observableArrayList());
this.check = selectedTask;
this.checkState = EasyBind.wrapNullable(selectedTask).mapObservable(Check::stateProperty);
this.checkName = EasyBind.wrapNullable(selectedTask).map(Check::getLocalizedName).orElse("");
this.checkName = EasyBind.wrapNullable(selectedTask).map(Check::getName).orElse("");
this.checkRunning = checkState.map(Check.CheckState.RUNNING::equals).orElse(false);
this.checkScheduled = checkState.map(Check.CheckState.SCHEDULED::equals).orElse(false);
this.checkSkipped = checkState.map(Check.CheckState.SKIPPED::equals).orElse(false);

2
src/main/java/org/cryptomator/ui/health/CheckListCellController.java
View File

@@ -27,7 +27,7 @@ public class CheckListCellController implements FxController {
public CheckListCellController() {
check = new SimpleObjectProperty<>();
checkRunnable = EasyBind.wrapNullable(check).mapObservable(Check::stateProperty).map(Check.CheckState.RUNNABLE::equals).orElse(false);
checkName = EasyBind.wrapNullable(check).map(Check::getLocalizedName).orElse("");
checkName = EasyBind.wrapNullable(check).map(Check::getName).orElse("");
subscriptions = new ArrayList<>();
}

4
src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
View File

@@ -67,8 +67,8 @@ abstract class HealthCheckModule {
@Provides
@HealthCheckScoped
static List<Check> provideAvailableChecks(ResourceBundle bundle) {
return HealthCheck.allChecks().stream().map(hc -> new Check(hc, bundle)).toList();
static List<Check> provideAvailableChecks() {
return HealthCheck.allChecks().stream().map(Check::new).toList();
}
@Provides