From 63b40091ea8b725d06192263185ff935817fe5a7 Mon Sep 17 00:00:00 2001 From: Martin Beyer Date: Thu, 18 Nov 2021 12:06:50 +0100 Subject: [PATCH] rename supporterCert WhiteSpace and VaultNameLength methods --- .../ui/preferences/SupporterCertificateController.java | 4 ++-- .../ui/vaultoptions/GeneralVaultOptionsController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java b/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java index 02b8bab91..db2554d67 100644 --- a/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java +++ b/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java @@ -34,10 +34,10 @@ public class SupporterCertificateController implements FxController { public void initialize() { supporterCertificateField.setText(licenseHolder.getLicenseKey().orElse(null)); supporterCertificateField.textProperty().addListener(this::registrationKeyChanged); - supporterCertificateField.setTextFormatter(new TextFormatter<>(this::checkVaultNameLength)); + supporterCertificateField.setTextFormatter(new TextFormatter<>(this::removeWhitespaces)); } - private TextFormatter.Change checkVaultNameLength(TextFormatter.Change change) { + private TextFormatter.Change removeWhitespaces(TextFormatter.Change change) { if (change.isContentChange()) { var strippedText = CharMatcher.whitespace().removeFrom(change.getText()); change.setText(strippedText); diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java index a35b108d9..633797820 100644 --- a/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java +++ b/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java @@ -47,7 +47,7 @@ public class GeneralVaultOptionsController implements FxController { public void initialize() { vaultName.textProperty().set(vault.getVaultSettings().displayName().get()); vaultName.focusedProperty().addListener(this::trimVaultNameOnFocusLoss); - vaultName.setTextFormatter(new TextFormatter<>(this::removeWhitespaces)); + vaultName.setTextFormatter(new TextFormatter<>(this::checkVaultNameLength)); unlockOnStartupCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().unlockAfterStartup()); actionAfterUnlockChoiceBox.getItems().addAll(WhenUnlocked.values()); actionAfterUnlockChoiceBox.valueProperty().bindBidirectional(vault.getVaultSettings().actionAfterUnlock()); @@ -63,7 +63,7 @@ public class GeneralVaultOptionsController implements FxController { } } - private TextFormatter.Change removeWhitespaces(TextFormatter.Change change) { + private TextFormatter.Change checkVaultNameLength(TextFormatter.Change change) { if (change.isContentChange() && change.getControlNewText().length() > VAULTNAME_TRUNCATE_THRESHOLD) { return null; // reject any change that would lead to a text exceeding threshold } else {