From 47f2d423b997ddebf86736e69677d0d02bbf472f Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 28 Jul 2022 11:16:59 +0200
Subject: [PATCH] Remove code smells

---
 .../org/cryptomator/common/settings/SettingsJsonAdapter.java  | 2 +-
 .../cryptomator/common/settings/VaultSettingsJsonAdapter.java | 2 +-
 src/main/java/org/cryptomator/common/vaults/FuseVolume.java   | 3 ---
 .../java/org/cryptomator/ui/controls/SecurePasswordField.java | 2 ++
 .../org/cryptomator/ui/mainwindow/VaultListController.java    | 4 ++++
 .../cryptomator/ui/migration/MigrationStartController.java    | 3 ---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
index 3f4614604..ff62672bd 100644
--- a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
+++ b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
@@ -103,7 +103,7 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 				case "language" -> settings.languageProperty().set(in.nextString());
 
 				default -> {
-					LOG.warn("Unsupported vault setting found in JSON: " + name);
+					LOG.warn("Unsupported vault setting found in JSON: {}", name);
 					in.skipValue();
 				}
 			}
diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
index 15a081f0d..a3a3118dc 100644
--- a/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
+++ b/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
@@ -73,7 +73,7 @@ class VaultSettingsJsonAdapter {
 				case "autoLockWhenIdle" -> autoLockWhenIdle = in.nextBoolean();
 				case "autoLockIdleSeconds" -> autoLockIdleSeconds = in.nextInt();
 				default -> {
-					LOG.warn("Unsupported vault setting found in JSON: " + name);
+					LOG.warn("Unsupported vault setting found in JSON: {}", name);
 					in.skipValue();
 				}
 			}
diff --git a/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index 0321cfa0f..3bc869592 100644
--- a/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -13,8 +13,6 @@ import org.cryptomator.frontend.fuse.mount.FuseMountFactory;
 import org.cryptomator.frontend.fuse.mount.FuseNotSupportedException;
 import org.cryptomator.frontend.fuse.mount.Mount;
 import org.cryptomator.frontend.fuse.mount.Mounter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -26,7 +24,6 @@ import java.util.regex.Pattern;
 
 public class FuseVolume extends AbstractVolume {
 
-	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
 	private static final Pattern NON_WHITESPACE_OR_QUOTED = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'"); // Thanks to https://stackoverflow.com/a/366532
 
 	private final VaultSettings vaultSettings;
diff --git a/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java b/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java
index 66df79394..a7ec9df6a 100644
--- a/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java
+++ b/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java
@@ -71,9 +71,11 @@ public class SecurePasswordField extends TextField {
 	}
 
 	public void cut() {
+		//not implemented by design
 	}
 
 	public void copy() {
+		//not implemented by design
 	}
 
 	public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
index dbe858a55..adb9a961b 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
@@ -69,11 +69,15 @@ public class VaultListController implements FxController {
 			}
 		});
 		vaultList.addEventFilter(MouseEvent.MOUSE_RELEASED, this::deselect);
+
+		//don't show context menu when no vault selected
 		vaultList.addEventFilter(ContextMenuEvent.CONTEXT_MENU_REQUESTED, request -> {
 			if (selectedVault.get() == null) {
 				request.consume();
 			}
 		});
+
+		//show removeVaultDialog on certain key press
 		vaultList.addEventFilter(KeyEvent.KEY_PRESSED, keyEvent -> {
 			if (keyEvent.getCode() == KeyCode.DELETE) {
 				pressedShortcutToRemoveVault();
diff --git a/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java b/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
index 27ad96d26..00d9364f7 100644
--- a/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
+++ b/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
@@ -25,9 +25,6 @@ public class MigrationStartController implements FxController {
 		this.runMigrationScene = runMigrationScene;
 	}
 
-	public void initialize() {
-	}
-
 	@FXML
 	public void cancel() {
 		window.close();