From d2680b98575f42905c72399bcf3149a92612d8d3 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 17 May 2021 13:06:28 +0200
Subject: [PATCH] Rename controller and fxml file which represents the whole
 health check screen

---
 .../src/main/java/org/cryptomator/ui/common/FxmlFile.java   | 2 +-
 .../{CheckListController.java => CheckController.java}      | 6 +++---
 .../java/org/cryptomator/ui/health/HealthCheckModule.java   | 5 ++---
 .../fxml/{health_check_list.fxml => health_check.fxml}      | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename main/ui/src/main/java/org/cryptomator/ui/health/{CheckListController.java => CheckController.java} (93%)
 rename main/ui/src/main/resources/fxml/{health_check_list.fxml => health_check.fxml} (96%)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index 32c142762..a1773d7af 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -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_list.fxml"), //
+	HEALTH_CHECK("/fxml/health_check.fxml"), //
 	LOCK_FORCED("/fxml/lock_forced.fxml"), //
 	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
similarity index 93%
rename from main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
rename to main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index fdad919cc..b301982ad 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -23,9 +23,9 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 @HealthCheckScoped
-public class CheckListController implements FxController {
+public class CheckController implements FxController {
 
-	private static final Logger LOG = LoggerFactory.getLogger(CheckListController.class);
+	private static final Logger LOG = LoggerFactory.getLogger(CheckController.class);
 	private static final Set<Worker.State> endStates = Set.of(Worker.State.FAILED, Worker.State.CANCELLED, Worker.State.SUCCEEDED);
 
 	private final ObservableList<HealthCheckTask> tasks;
@@ -42,7 +42,7 @@ public class CheckListController implements FxController {
 
 
 	@Inject
-	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
+	public CheckController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index aafb5cb22..a410d3f13 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -27,7 +27,6 @@ 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;
@@ -126,8 +125,8 @@ abstract class HealthCheckModule {
 
 	@Binds
 	@IntoMap
-	@FxControllerKey(CheckListController.class)
-	abstract FxController bindCheckController(CheckListController controller);
+	@FxControllerKey(CheckController.class)
+	abstract FxController bindChecksController(CheckController controller);
 
 	@Binds
 	@IntoMap
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
similarity index 96%
rename from main/ui/src/main/resources/fxml/health_check_list.fxml
rename to main/ui/src/main/resources/fxml/health_check.fxml
index b7520a08a..84c7d66c4 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check.fxml
@@ -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.CheckListController"
+	  fx:controller="org.cryptomator.ui.health.CheckController"
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"