mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 18:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/modular

Browse Source
This commit is contained in:
Sebastian Stenzel
2021-07-19 15:54:02 +02:00
committed by GitHub
parent 44cadce23d 397061a6e7
commit 1ab4aa94b3
10 changed files with 159 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
View File

@@ -47,10 +47,10 @@ class HealthCheckTask extends Task<Void> {
this.check = Objects.requireNonNull(check);
this.results = FXCollections.observableArrayList(Result::observables);
try {
updateTitle(resourceBundle.getString("health." + check.identifier()));
updateTitle(resourceBundle.getString("health." + check.name()));
} catch (MissingResourceException e) {
LOG.warn("Missing proper name for health check {}, falling back to default.", check.identifier());
updateTitle(check.identifier());
LOG.warn("Missing proper name for health check {}, falling back to default.", check.name());
updateTitle(check.name());
}
this.durationInMillis = new SimpleLongProperty(-1);
this.chosenForExecution = new SimpleBooleanProperty();
@@ -74,12 +74,12 @@ class HealthCheckTask extends Task<Void> {
@Override
protected void scheduled() {
LOG.info("starting {}", check.identifier());
LOG.info("starting {}", check.name());
}
@Override
protected void done() {
LOG.info("finished {}", check.identifier());
LOG.info("finished {}", check.name());
}
/* Getter */

6
src/main/java/org/cryptomator/ui/health/ReportWriter.java
View File

@@ -64,10 +64,10 @@ public class ReportWriter {
writer.write(REPORT_HEADER.formatted(vaultConfig.getId(), vault.getDisplayName(), vault.getPath()));
for (var task : tasks) {
if (task.getState() == Worker.State.READY) {
LOG.debug("Skipping not performed check {}.", task.getCheck().identifier());
LOG.debug("Skipping not performed check {}.", task.getCheck().name());
continue;
}
writer.write(REPORT_CHECK_HEADER.formatted(task.getCheck().identifier()));
writer.write(REPORT_CHECK_HEADER.formatted(task.getCheck().name()));
switch (task.getState()) {
case SUCCEEDED -> {
writer.write("STATUS: SUCCESS\nRESULTS:\n");
@@ -77,7 +77,7 @@ public class ReportWriter {
}
case CANCELLED -> writer.write("STATUS: CANCELED\n");
case FAILED -> {
writer.write("STATUS: FAILED\nREASON:\n" + task.getCheck().identifier());
writer.write("STATUS: FAILED\nREASON:\n" + task.getCheck().name());
writer.write(prepareFailureMsg(task));
}
case RUNNING, SCHEDULED -> throw new IllegalStateException("Checks are still running.");