mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 12:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert d2680b9857

Browse Source
This commit is contained in:
Armin Schrenk
2021-05-18 13:36:00 +02:00
parent 9d89efc98c
commit 66a8dc9811
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
View File

@@ -12,7 +12,7 @@ public enum FxmlFile {
ERROR("/fxml/error.fxml"), //
FORGET_PASSWORD("/fxml/forget_password.fxml"), //
HEALTH_START("/fxml/health_start.fxml"), //
HEALTH_CHECK("/fxml/health_check.fxml"), //
HEALTH_CHECK("/fxml/health_check_list.fxml"), //
LOCK_FORCED("/fxml/lock_forced.fxml"), //
LOCK_FAILED("/fxml/lock_failed.fxml"), //
MAIN_WINDOW("/fxml/main_window.fxml"), //

6
main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java → main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
View File

@@ -27,9 +27,9 @@ import java.util.Set;
import java.util.concurrent.ExecutorService;
@HealthCheckScoped
public class CheckController implements FxController {
public class CheckListController implements FxController {
private static final Logger LOG = LoggerFactory.getLogger(CheckController.class);
private static final Logger LOG = LoggerFactory.getLogger(CheckListController.class);
private static final Set<Worker.State> endStates = Set.of(Worker.State.FAILED, Worker.State.CANCELLED, Worker.State.SUCCEEDED);
private final ObservableList<HealthCheckTask> tasks;
@@ -49,7 +49,7 @@ public class CheckController implements FxController {
@Inject
public CheckController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, ResourceBundle resourceBundle) {
public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, ResourceBundle resourceBundle) {
this.tasks = FXCollections.observableArrayList(tasks.get());
this.reportWriter = reportWriteTask;
this.executorService = executorService;

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

@@ -27,6 +27,7 @@ import javafx.scene.Scene;
import javafx.stage.Modality;
import javafx.stage.Stage;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
import java.util.Optional;
@@ -125,8 +126,8 @@ abstract class HealthCheckModule {
@Binds
@IntoMap
@FxControllerKey(CheckController.class)
abstract FxController bindChecksController(CheckController controller);
@FxControllerKey(CheckListController.class)
abstract FxController bindCheckController(CheckListController controller);
@Binds
@IntoMap

2
main/ui/src/main/resources/fxml/health_check.fxml → main/ui/src/main/resources/fxml/health_check_list.fxml
View File

@@ -9,7 +9,7 @@
<?import javafx.scene.layout.VBox?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.health.CheckController"
fx:controller="org.cryptomator.ui.health.CheckListController"
minWidth="400"
maxWidth="400"
minHeight="145"