rename property and getters in vault class for display name.

main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java

@@ -56,7 +56,7 @@ public class Vault {
 	private final ObjectProperty<VaultState> state;
 	private final ObjectProperty<Exception> lastKnownException;
 	private final VaultStats stats;
-	private final StringBinding displayableName;
+	private final StringBinding displayName;
 	private final StringBinding displayablePath;
 	private final BooleanBinding locked;
 	private final BooleanBinding processing;
@@ -78,7 +78,7 @@ public class Vault {
 		this.state = state;
 		this.lastKnownException = lastKnownException;
 		this.stats = stats;
-		this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.displayName());
+		this.displayName = Bindings.createStringBinding(this::getDisplayName, vaultSettings.displayName());
 		this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path());
 		this.locked = Bindings.createBooleanBinding(this::isLocked, state);
 		this.processing = Bindings.createBooleanBinding(this::isProcessing, state);
@@ -225,11 +225,11 @@ public class Vault {
 		return state.get() == VaultState.ERROR;
 	}
 
-	public StringBinding displayableNameProperty() {
-		return displayableName;
+	public StringBinding displayNameProperty() {
+		return displayName;
 	}
 
-	public String getDisplayableName() {
+	public String getDisplayName() {
 		return vaultSettings.displayName().get();
 	}
 

main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java

@@ -67,7 +67,7 @@ public class ChangePasswordController implements FxController {
 	public void finish() {
 		try {
 			CryptoFileSystemProvider.changePassphrase(vault.getPath(), MASTERKEY_FILENAME, oldPasswordField.getCharacters(), newPassword.get());
-			LOG.info("Successfully changed password for {}", vault.getDisplayableName());
+			LOG.info("Successfully changed password for {}", vault.getDisplayName());
 			window.close();
 			updatePasswordInSystemkeychain();
 		} catch (IOException e) {
@@ -84,7 +84,7 @@ public class ChangePasswordController implements FxController {
 		if (keychain.isPresent()) {
 			try {
 				keychain.get().changePassphrase(vault.getId(), CharBuffer.wrap(newPassword.get()));
-				LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayableName());
+				LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayName());
 			} catch (KeychainAccessException e) {
 				LOG.error("Failed to update password in system keychain.", e);
 			}

main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java

@@ -44,8 +44,8 @@ public class VaultService {
 	 */
 	public Task<Vault> createRevealTask(Vault vault) {
 		Task<Vault> task = new RevealVaultTask(vault);
-		task.setOnSucceeded(evt -> LOG.info("Revealed {}", vault.getDisplayableName()));
-		task.setOnFailed(evt -> LOG.error("Failed to reveal " + vault.getDisplayableName(), evt.getSource().getException()));
+		task.setOnSucceeded(evt -> LOG.info("Revealed {}", vault.getDisplayName()));
+		task.setOnFailed(evt -> LOG.error("Failed to reveal " + vault.getDisplayName(), evt.getSource().getException()));
 		return task;
 	}
 
@@ -68,8 +68,8 @@ public class VaultService {
 	 */
 	public Task<Vault> createLockTask(Vault vault, boolean forced) {
 		Task<Vault> task = new LockVaultTask(vault, forced);
-		task.setOnSucceeded(evt -> LOG.info("Locked {}", vault.getDisplayableName()));
-		task.setOnFailed(evt -> LOG.error("Failed to lock " + vault.getDisplayableName(), evt.getSource().getException()));
+		task.setOnSucceeded(evt -> LOG.info("Locked {}", vault.getDisplayName()));
+		task.setOnFailed(evt -> LOG.error("Failed to lock " + vault.getDisplayName(), evt.getSource().getException()));
 		return task;
 	}
 
@@ -94,7 +94,7 @@ public class VaultService {
 		List<Task<Vault>> lockTasks = vaults.stream().map(v -> new LockVaultTask(v, forced)).collect(Collectors.toUnmodifiableList());
 		lockTasks.forEach(executorService::execute);
 		Task<Collection<Vault>> task = new WaitForTasksTask(lockTasks);
-		String vaultNames = vaults.stream().map(Vault::getDisplayableName).collect(Collectors.joining(", "));
+		String vaultNames = vaults.stream().map(Vault::getDisplayName).collect(Collectors.joining(", "));
 		task.setOnSucceeded(evt -> LOG.info("Locked {}", vaultNames));
 		task.setOnFailed(evt -> LOG.error("Failed to lock vaults " + vaultNames, evt.getSource().getException()));
 		return task;

main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java

@@ -41,7 +41,7 @@ public class ForgetPasswordController implements FxController {
 		if (keychain.isPresent()) {
 			try {
 				keychain.get().deletePassphrase(vault.getId());
-				LOG.debug("Forgot password for vault {}.", vault.getDisplayableName());
+				LOG.debug("Forgot password for vault {}.", vault.getDisplayName());
 				confirmedResult.setValue(true);
 			} catch (KeychainAccessException e) {
 				LOG.error("Failed to remove entry from system keychain.", e);

main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java

@@ -6,7 +6,6 @@ import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 import javafx.stage.Stage;
 import org.cryptomator.common.LicenseHolder;
@@ -99,7 +98,7 @@ public class FxApplication extends Application {
 	public void startUnlockWorkflow(Vault vault, Optional<Stage> owner) {
 		Platform.runLater(() -> {
 			unlockWindowBuilderProvider.get().vault(vault).owner(owner).build().startUnlockWorkflow();
-			LOG.debug("Showing UnlockWindow for {}", vault.getDisplayableName());
+			LOG.debug("Showing UnlockWindow for {}", vault.getDisplayName());
 		});
 	}
 

main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java

@@ -116,10 +116,10 @@ public class MigrationRunController implements FxController {
 			return migrators.needsMigration(vault.getPath(), MASTERKEY_FILENAME);
 		}).onSuccess(needsAnotherMigration -> {
 			if (needsAnotherMigration) {
-				LOG.info("Migration of '{}' succeeded, but another migration is required.", vault.getDisplayableName());
+				LOG.info("Migration of '{}' succeeded, but another migration is required.", vault.getDisplayName());
 				vault.setState(VaultState.NEEDS_MIGRATION);
 			} else {
-				LOG.info("Migration of '{}' succeeded.", vault.getDisplayableName());
+				LOG.info("Migration of '{}' succeeded.", vault.getDisplayName());
 				vault.setState(VaultState.LOCKED);
 				passwordField.wipe();
 				window.setScene(successScene.get());

main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java

@@ -53,7 +53,7 @@ public class QuitController implements FxController {
 
 		Task<Collection<Vault>> lockAllTask = vaultService.createLockAllTask(unlockedVaults, false);
 		lockAllTask.setOnSucceeded(evt -> {
-			LOG.info("Locked {}", lockAllTask.getValue().stream().map(Vault::getDisplayableName).collect(Collectors.joining(", ")));
+			LOG.info("Locked {}", lockAllTask.getValue().stream().map(Vault::getDisplayName).collect(Collectors.joining(", ")));
 			if (unlockedVaults.isEmpty()) {
 				window.close();
 				response.performQuit();

main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java

@@ -9,7 +9,6 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
@@ -25,7 +24,6 @@ import org.cryptomator.ui.common.StageFactory;
 
 import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -107,7 +105,7 @@ abstract class RecoveryKeyModule {
 	@IntoMap
 	@FxControllerKey(RecoveryKeyDisplayController.class)
 	static FxController provideRecoveryKeyDisplayController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, @RecoveryKeyWindow StringProperty recoveryKey, ResourceBundle localization) {
-		return new RecoveryKeyDisplayController(window, vault.getDisplayableName(), recoveryKey.get(), localization);
+		return new RecoveryKeyDisplayController(window, vault.getDisplayName(), recoveryKey.get(), localization);
 	}
 
 	@Binds

main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java

@@ -34,7 +34,7 @@ public class RemoveVaultController implements FxController {
 	@FXML
 	public void finish() {
 		vaults.remove(vault);
-		LOG.debug("Removing vault {}.", vault.getDisplayableName());
+		LOG.debug("Removing vault {}.", vault.getDisplayName());
 		window.close();
 	}
 }

main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java

@@ -80,7 +80,7 @@ class TrayMenuController {
 	}
 
 	private Menu buildSubmenu(Vault vault) {
-		Menu submenu = new Menu(vault.getDisplayableName());
+		Menu submenu = new Menu(vault.getDisplayName());
 
 		if (vault.isLocked()) {
 			MenuItem unlockItem = new MenuItem(resourceBundle.getString("traymenu.vault.unlock"));

main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java

@@ -77,7 +77,7 @@ public class UnlockController implements FxController {
 		this.unlockButtonContentDisplay = Bindings.createObjectBinding(this::getUnlockButtonContentDisplay, passwordEntryLock.awaitingInteraction());
 		this.userInteractionDisabled = passwordEntryLock.awaitingInteraction().not();
 		this.unlockButtonDisabled = new SimpleBooleanProperty();
-		this.vaultName = WeakBindings.bindString(vault.displayableNameProperty());
+		this.vaultName = WeakBindings.bindString(vault.displayNameProperty());
 		this.window.setOnCloseRequest(windowEvent -> cancel());
 	}
 

main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java

@@ -82,7 +82,7 @@ abstract class UnlockModule {
 	@UnlockScoped
 	static Stage provideStage(StageFactory factory, @UnlockWindow Vault vault, @Named("unlockWindowOwner") Optional<Stage> owner) {
 		Stage stage = factory.create();
-		stage.setTitle(vault.getDisplayableName());
+		stage.setTitle(vault.getDisplayName());
 		stage.setResizable(false);
 		if (owner.isPresent()) {
 			stage.initOwner(owner.get());

main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java

@@ -128,7 +128,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 	}
 
 	private void handleSuccess() {
-		LOG.info("Unlock of '{}' succeeded.", vault.getDisplayableName());
+		LOG.info("Unlock of '{}' succeeded.", vault.getDisplayName());
 		if (savePassword.get()) {
 			savePasswordToSystemkeychain();
 		}

main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java

@@ -5,7 +5,6 @@ import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
@@ -20,9 +19,7 @@ import org.cryptomator.ui.common.StageFactory;
 import org.cryptomator.ui.mainwindow.MainWindow;
 import org.cryptomator.ui.recoverykey.RecoveryKeyComponent;
 
-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -41,7 +38,7 @@ abstract class VaultOptionsModule {
 	@VaultOptionsScoped
 	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, @VaultOptionsWindow Vault vault) {
 		Stage stage = factory.create();
-		stage.setTitle(vault.getDisplayableName());
+		stage.setTitle(vault.getDisplayName());
 		stage.setResizable(true);
 		stage.setMinWidth(400);
 		stage.setMinHeight(300);

main/ui/src/main/resources/fxml/addvault_success.fxml

@@ -30,7 +30,7 @@
 
 		<Region VBox.vgrow="ALWAYS"/>
 
-		<FormattedLabel format="%addvaultwizard.success.nextStepsInstructions" arg1="${controller.vault.displayableName}" wrapText="true" HBox.hgrow="ALWAYS"/>
+		<FormattedLabel format="%addvaultwizard.success.nextStepsInstructions" arg1="${controller.vault.displayName}" wrapText="true" HBox.hgrow="ALWAYS"/>
 
 		<Region VBox.vgrow="ALWAYS"/>
 

main/ui/src/main/resources/fxml/changepassword.fxml

@@ -19,7 +19,7 @@
 	</padding>
 	<children>
 		<VBox spacing="6">
-			<FormattedLabel format="%changepassword.enterOldPassword" arg1="${controller.vault.displayableName}" wrapText="true"/>
+			<FormattedLabel format="%changepassword.enterOldPassword" arg1="${controller.vault.displayName}" wrapText="true"/>
 			<NiceSecurePasswordField fx:id="oldPasswordField"/>
 		</VBox>
 

main/ui/src/main/resources/fxml/migration_run.fxml

@@ -21,7 +21,7 @@
 	</padding>
 	<children>
 		<VBox spacing="6" visible="${!controller.vault.processing}" managed="${!controller.vault.processing}">
-			<FormattedLabel format="%migration.run.enterPassword" arg1="${controller.vault.displayableName}" wrapText="true"/>
+			<FormattedLabel format="%migration.run.enterPassword" arg1="${controller.vault.displayName}" wrapText="true"/>
 			<NiceSecurePasswordField fx:id="passwordField"/>
 		</VBox>
 

main/ui/src/main/resources/fxml/migration_start.fxml

@@ -28,7 +28,7 @@
 			</StackPane>
 
 			<VBox spacing="6" HBox.hgrow="ALWAYS">
-				<FormattedLabel format="%migration.start.prompt" arg1="${controller.vault.displayableName}" wrapText="true" />
+				<FormattedLabel format="%migration.start.prompt" arg1="${controller.vault.displayName}" wrapText="true" />
 				<CheckBox fx:id="confirmSyncDone" text="%migration.start.confirm"/>
 			</VBox>
 		</HBox>

main/ui/src/main/resources/fxml/migration_success.fxml

@@ -25,7 +25,7 @@
 				<Circle styleClass="glyph-icon-primary" radius="24"/>
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="CHECK" glyphSize="24"/>
 			</StackPane>
-			<FormattedLabel format="%migration.success.nextStepsInstructions" arg1="${controller.vault.displayableName}" wrapText="true" HBox.hgrow="ALWAYS"/>
+			<FormattedLabel format="%migration.success.nextStepsInstructions" arg1="${controller.vault.displayName}" wrapText="true" HBox.hgrow="ALWAYS"/>
 		</HBox>
 
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">

main/ui/src/main/resources/fxml/recoverykey_create.fxml

@@ -20,7 +20,7 @@
 	</padding>
 	<children>
 		<VBox spacing="6">
-			<FormattedLabel format="%recoveryKey.enterPassword.prompt" arg1="${controller.vault.displayableName}" wrapText="true"/>
+			<FormattedLabel format="%recoveryKey.enterPassword.prompt" arg1="${controller.vault.displayName}" wrapText="true"/>
 			<NiceSecurePasswordField fx:id="passwordField" HBox.hgrow="ALWAYS"/>
 		</VBox>
 

main/ui/src/main/resources/fxml/recoverykey_recover.fxml

@@ -21,7 +21,7 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<FormattedLabel format="%recoveryKey.recover.prompt" arg1="${controller.vault.displayableName}" wrapText="true"/>
+		<FormattedLabel format="%recoveryKey.recover.prompt" arg1="${controller.vault.displayName}" wrapText="true"/>
 
 		<TextArea wrapText="true" prefRowCount="4" fx:id="textarea" textFormatter="${controller.recoveryKeyTextFormatter}" onKeyPressed="#onKeyPressed"/>
 		

main/ui/src/main/resources/fxml/unlock_success.fxml

@@ -28,7 +28,7 @@
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="CHECK" glyphSize="24"/>
 			</StackPane>
 			<VBox spacing="6">
-				<FormattedLabel format="%unlock.success.message" arg1="${controller.vault.displayableName}" wrapText="true" HBox.hgrow="ALWAYS"/>
+				<FormattedLabel format="%unlock.success.message" arg1="${controller.vault.displayName}" wrapText="true" HBox.hgrow="ALWAYS"/>
 				<CheckBox text="%unlock.success.rememberChoice" fx:id="rememberChoiceCheckbox"/>
 			</VBox>
 		</HBox>

main/ui/src/main/resources/fxml/vault_detail.fxml

@@ -26,9 +26,9 @@
 			</StackPane>
 			<VBox spacing="4" HBox.hgrow="ALWAYS">
 				<HBox spacing="12">
-					<Label styleClass="label-large" text="${controller.vault.displayableName}">
+					<Label styleClass="label-large" text="${controller.vault.displayName}">
 						<tooltip>
-							<Tooltip text="${controller.vault.displayableName}"/>
+							<Tooltip text="${controller.vault.displayName}"/>
 						</tooltip>
 					</Label>
 					<Region HBox.hgrow="ALWAYS"/>

main/ui/src/main/resources/fxml/vault_list_cell.fxml

@@ -20,7 +20,7 @@
 			<FontAwesome5IconView glyph="${controller.glyph}" HBox.hgrow="NEVER" glyphSize="16"/>
 		</VBox>
 		<VBox spacing="4" HBox.hgrow="ALWAYS">
-			<Label styleClass="header-label" text="${controller.vault.displayableName}"/>
+			<Label styleClass="header-label" text="${controller.vault.displayName}"/>
 			<Label styleClass="detail-label" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS"/>
 		</VBox>
 	</children>