mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 10:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename classes

Browse Source
This commit is contained in:
Armin Schrenk
2023-04-18 14:34:48 +02:00
parent 2a01aba3cf
commit dc9b39202f
13 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/cryptomator/ui/common/FxmlFile.java
View File

@@ -9,9 +9,9 @@ public enum FxmlFile {
ADDVAULT_SUCCESS("/fxml/addvault_success.fxml"), //
ADDVAULT_WELCOME("/fxml/addvault_welcome.fxml"), //
CHANGEPASSWORD("/fxml/changepassword.fxml"), //
CONVERTVAULT_HUBTOLOCAL_START("/fxml/convertvault_hubtolocal_start.fxml"), //
CONVERTVAULT_HUBTOLOCAL_CONVERT("/fxml/convertvault_hubtolocal_convert.fxml"), //
CONVERTVAULT_HUBTOLOCAL_SUCCESS("/fxml/convertvault_hubtolocal_success.fxml"), //
CONVERTVAULT_HUBTOPASSWORD_START("/fxml/convertvault_hubtopassword_start.fxml"), //
CONVERTVAULT_HUBTOPASSWORD_CONVERT("/fxml/convertvault_hubtopassword_convert.fxml"), //
CONVERTVAULT_HUBTOPASSWORD_SUCCESS("/fxml/convertvault_hubtopassword_success.fxml"), //
ERROR("/fxml/error.fxml"), //
FORGET_PASSWORD("/fxml/forget_password.fxml"), //
HEALTH_START("/fxml/health_start.fxml"), //

8
src/main/java/org/cryptomator/ui/convertvault/ConvertVaultComponent.java
View File

@@ -23,12 +23,12 @@ public interface ConvertVaultComponent {
@ConvertVaultWindow
Stage window();
@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_START)
Lazy<Scene> hubToLocalScene();
@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_START)
Lazy<Scene> hubToPasswordScene();
default void showHubToLocalWindow() {
default void showHubToPasswordWindow() {
Stage stage = window();
stage.setScene(hubToLocalScene().get());
stage.setScene(hubToPasswordScene().get());
stage.sizeToScene();
stage.show();
}

30
src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
View File

@@ -71,42 +71,42 @@ abstract class ConvertVaultModule {
}
@Provides
@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_START)
@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_START)
@ConvertVaultScoped
static Scene provideHubToLocalStartScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_START);
static Scene provideHubToPasswordStartScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_START);
}
@Provides
@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_CONVERT)
@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_CONVERT)
@ConvertVaultScoped
static Scene provideHubToLocalConvertScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_CONVERT);
static Scene provideHubToPasswordConvertScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_CONVERT);
}
@Provides
@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_SUCCESS)
@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_SUCCESS)
@ConvertVaultScoped
static Scene provideHubToLocalSuccessScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_SUCCESS);
static Scene provideHubToPasswordSuccessScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_SUCCESS);
}
// ------------------
@Binds
@IntoMap
@FxControllerKey(HubToLocalStartController.class)
abstract FxController bindHubToLocalStartController(HubToLocalStartController controller);
@FxControllerKey(HubToPasswordStartController.class)
abstract FxController bindHubToPasswordStartController(HubToPasswordStartController controller);
@Binds
@IntoMap
@FxControllerKey(HubToLocalConvertController.class)
abstract FxController bindHubToLocalConvertController(HubToLocalConvertController controller);
@FxControllerKey(HubToPasswordConvertController.class)
abstract FxController bindHubToPasswordConvertController(HubToPasswordConvertController controller);
@Binds
@IntoMap
@FxControllerKey(HubToLocalSuccessController.class)
abstract FxController bindHubToLocalSuccessController(HubToLocalSuccessController controller);
@FxControllerKey(HubToPasswordSuccessController.class)
abstract FxController bindHubToPasswordSuccessController(HubToPasswordSuccessController controller);
@Provides

6
src/main/java/org/cryptomator/ui/convertvault/HubToLocalConvertController.java → src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java
View File

@@ -44,9 +44,9 @@ import static org.cryptomator.common.Constants.MASTERKEY_BACKUP_SUFFIX;
import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
import static org.cryptomator.common.Constants.VAULTCONFIG_FILENAME;
public class HubToLocalConvertController implements FxController {
public class HubToPasswordConvertController implements FxController {
private static final Logger LOG = LoggerFactory.getLogger(HubToLocalConvertController.class);
private static final Logger LOG = LoggerFactory.getLogger(HubToPasswordConvertController.class);
private final Stage window;
private final Lazy<Scene> successScene;
@@ -64,7 +64,7 @@ public class HubToLocalConvertController implements FxController {
public Button convertBtn;
@Inject
public HubToLocalConvertController(@ConvertVaultWindow Stage window, @FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_SUCCESS) Lazy<Scene> successScene, FxApplicationWindows applicationWindows, @ConvertVaultWindow Vault vault, @ConvertVaultWindow StringProperty recoveryKey, RecoveryKeyFactory recoveryKeyFactory, MasterkeyFileAccess masterkeyFileAccess, ExecutorService backgroundExecutorService, ResourceBundle resourceBundle) {
public HubToPasswordConvertController(@ConvertVaultWindow Stage window, @FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_SUCCESS) Lazy<Scene> successScene, FxApplicationWindows applicationWindows, @ConvertVaultWindow Vault vault, @ConvertVaultWindow StringProperty recoveryKey, RecoveryKeyFactory recoveryKeyFactory, MasterkeyFileAccess masterkeyFileAccess, ExecutorService backgroundExecutorService, ResourceBundle resourceBundle) {
this.window = window;
this.successScene = successScene;
this.applicationWindows = applicationWindows;

4
src/main/java/org/cryptomator/ui/convertvault/HubToLocalStartController.java → src/main/java/org/cryptomator/ui/convertvault/HubToPasswordStartController.java
View File

@@ -11,7 +11,7 @@ import javafx.fxml.FXML;
import javafx.scene.Scene;
import javafx.stage.Stage;
public class HubToLocalStartController implements FxController {
public class HubToPasswordStartController implements FxController {
private final Stage window;
private final Lazy<Scene> convertScene;
@@ -20,7 +20,7 @@ public class HubToLocalStartController implements FxController {
RecoveryKeyValidateController recoveryKeyValidateController;
@Inject
public HubToLocalStartController(@ConvertVaultWindow Stage window, @FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_CONVERT) Lazy<Scene> convertScene) {
public HubToPasswordStartController(@ConvertVaultWindow Stage window, @FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_CONVERT) Lazy<Scene> convertScene) {
this.window = window;
this.convertScene = convertScene;
}

5
src/main/java/org/cryptomator/ui/convertvault/HubToLocalSuccessController.java → src/main/java/org/cryptomator/ui/convertvault/HubToPasswordSuccessController.java
View File

@@ -2,19 +2,18 @@ package org.cryptomator.ui.convertvault;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.fxapp.FxApplicationWindows;
import javax.inject.Inject;
import javafx.fxml.FXML;
import javafx.stage.Stage;
public class HubToLocalSuccessController implements FxController {
public class HubToPasswordSuccessController implements FxController {
private final Stage window;
private final Vault vault;
@Inject
HubToLocalSuccessController(@ConvertVaultWindow Stage window, @ConvertVaultWindow Vault vault) {
HubToPasswordSuccessController(@ConvertVaultWindow Stage window, @ConvertVaultWindow Vault vault) {
this.window = window;
this.vault = vault;
}

2
src/main/java/org/cryptomator/ui/vaultoptions/HubOptionsController.java
View File

@@ -22,6 +22,6 @@ public class HubOptionsController implements FxController {
}
public void startConversion() {
convertVaultFactory.create(vault,window).showHubToLocalWindow();
convertVaultFactory.create(vault,window).showHubToPasswordWindow();
}
}

2
src/main/resources/fxml/convertvault_hubtolocal_convert.fxml → src/main/resources/fxml/convertvault_hubtopassword_convert.fxml
View File

@@ -8,7 +8,7 @@
<?import javafx.scene.layout.VBox?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.convertvault.HubToLocalConvertController"
fx:controller="org.cryptomator.ui.convertvault.HubToPasswordConvertController"
minWidth="400"
maxWidth="400"
minHeight="145"

2
src/main/resources/fxml/convertvault_hubtolocal_start.fxml → src/main/resources/fxml/convertvault_hubtopassword_start.fxml
View File

@@ -7,7 +7,7 @@
<?import javafx.scene.control.Button?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.convertvault.HubToLocalStartController"
fx:controller="org.cryptomator.ui.convertvault.HubToPasswordStartController"
minWidth="400"
maxWidth="400"
minHeight="145"

4
src/main/resources/fxml/convertvault_hubtolocal_success.fxml → src/main/resources/fxml/convertvault_hubtopassword_success.fxml
View File

@@ -14,7 +14,7 @@
<?import javafx.scene.Group?>
<HBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.convertvault.HubToLocalSuccessController"
fx:controller="org.cryptomator.ui.convertvault.HubToPasswordSuccessController"
minWidth="400"
maxWidth="400"
minHeight="145"
@@ -41,7 +41,7 @@
</padding>
</Label>
<Label text="%convertVault.success.description" wrapText="true" textAlignment="LEFT"/>
<Label text="%convertVault.hubToPassword.success.description" wrapText="true" textAlignment="LEFT"/>
<Region VBox.vgrow="ALWAYS" minHeight="18"/>
<ButtonBar buttonMinWidth="120" buttonOrder="+C">

2
src/main/resources/fxml/vault_options_hub.fxml
View File

@@ -16,7 +16,7 @@
<Label maxWidth="-Infinity" text="%vaultOptions.hub.convertInfo" wrapText="true"/>
<VBox spacing="6" alignment="CENTER">
<Button fx:id="convertToLocalButton" text="%vaultOptions.hub.convertBtn" onAction="#startConversion" maxWidth="Infinity">
<Button fx:id="convertHubToPasswordButton" text="%vaultOptions.hub.convertBtn" onAction="#startConversion" maxWidth="Infinity">
<graphic>
<FontAwesome5IconView glyph="EXCHANGE_ALT"/>
</graphic>

2
src/main/resources/i18n/strings.properties
View File

@@ -465,7 +465,7 @@ convertVault.title=Convert Vault
convertVault.convert.convertBtn.before=Convert
convertVault.convert.convertBtn.processing=Converting…
convertVault.success.message=Conversion successful
convertVault.success.description=You can now unlock the vault with the chosen password without requiring Hub access.
convertVault.hubToPassword.success.description=You can now unlock the vault with the chosen password without requiring Hub access.
# New Password
newPassword.promptText=Enter a new password

8
src/test/java/org/cryptomator/ui/convertvault/HubToLocalConvertControllerTest.java → src/test/java/org/cryptomator/ui/convertvault/HubToPasswordConvertControllerTest.java
View File

@@ -34,7 +34,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.times;
public class HubToLocalConvertControllerTest {
public class HubToPasswordConvertControllerTest {
Stage window;
Vault vault;
@@ -49,7 +49,7 @@ public class HubToLocalConvertControllerTest {
NewPasswordController newPasswordController;
HubToLocalConvertController inTest;
HubToPasswordConvertController inTest;
@BeforeEach
public void beforeEach() {
@@ -64,7 +64,7 @@ public class HubToLocalConvertControllerTest {
appWindows = Mockito.mock(FxApplicationWindows.class);
successScene = Mockito.mock(Lazy.class);
newPasswordController = Mockito.mock(NewPasswordController.class);
inTest = new HubToLocalConvertController(window, successScene, appWindows, vault, recoveryKey, recoveryKeyFactory, masterkeyFileAccess, backgroundExecutorService, resourceBundle);
inTest = new HubToPasswordConvertController(window, successScene, appWindows, vault, recoveryKey, recoveryKeyFactory, masterkeyFileAccess, backgroundExecutorService, resourceBundle);
inTest.newPasswordController = newPasswordController;
}
@@ -93,7 +93,7 @@ public class HubToLocalConvertControllerTest {
Path vaultPath = Mockito.mock(Path.class, "/vault/path");
Path configPath = Mockito.mock(Path.class, "/vault/path/config");
String actualRecoveryKey = "recoveryKey";
HubToLocalConvertController inSpy;
HubToPasswordConvertController inSpy;
@BeforeEach
public void beforeEach() throws IOException {