From 080ddbbb0196554b96a8829e367d62225447fce7 Mon Sep 17 00:00:00 2001 From: JaniruTEC Date: Tue, 18 Jan 2022 02:25:04 +0100 Subject: [PATCH] Applied changes from code review. --- .../org/cryptomator/common/vaults/MountPointRequirement.java | 2 +- src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java | 2 +- src/main/resources/i18n/strings.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java b/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java index b7510e811..cc21df03d 100644 --- a/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java +++ b/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java @@ -7,7 +7,7 @@ package org.cryptomator.common.vaults; public enum MountPointRequirement { /** - * There must not be a parent folder and the actual Mountpoint must not exist. + * The Mountpoint needs to be a filesystem root and must not exist. */ NO_PARENT_NO_MOUNT_POINT, diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java index db7b6f7d9..1227fc9de 100644 --- a/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java +++ b/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java @@ -96,7 +96,7 @@ public class UnlockWorkflow extends Task { showInvalidMountPointScene(); } else if (cause instanceof FileAlreadyExistsException) { if (requirement == MountPointRequirement.NO_PARENT_NO_MOUNT_POINT) { - LOG.error("Unlock failed. Drive Letter already occupied: {}", cause.getMessage()); + LOG.error("Unlock failed. Drive Letter already in use: {}", cause.getMessage()); } else { LOG.error("Unlock failed. Mountpoint already exists: {}", cause.getMessage()); } diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index 241c8e538..36932b877 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -116,7 +116,7 @@ unlock.error.heading=Unable to unlock vault ### Invalid Mount Point unlock.error.invalidMountPoint.notExisting=Mount point "%s" is not a directory, not empty or does not exist. unlock.error.invalidMountPoint.existing=Mount point "%s" already exists or parent folder is missing. -unlock.error.invalidMountPoint.driveLetterOccupied=Drive Letter "%s" is already occupied. +unlock.error.invalidMountPoint.driveLetterOccupied=Drive Letter "%s" is already in use. # Lock ## Force