diff --git a/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/src/main/java/org/cryptomator/ui/common/FxmlFile.java index 8e0403de5..938f93687 100644 --- a/src/main/java/org/cryptomator/ui/common/FxmlFile.java +++ b/src/main/java/org/cryptomator/ui/common/FxmlFile.java @@ -12,7 +12,7 @@ public enum FxmlFile { CONVERTVAULT_HUBTOPASSWORD_START("/fxml/convertvault_hubtopassword_start.fxml"), // CONVERTVAULT_HUBTOPASSWORD_CONVERT("/fxml/convertvault_hubtopassword_convert.fxml"), // CONVERTVAULT_HUBTOPASSWORD_SUCCESS("/fxml/convertvault_hubtopassword_success.fxml"), // - DOKANY_SUPPORT_END_DIALOG("/fxml/dokany_support_end.fxml"), // + DOKANY_SUPPORT_END("/fxml/dokany_support_end.fxml"), // ERROR("/fxml/error.fxml"), // FORGET_PASSWORD("/fxml/forget_password.fxml"), // HEALTH_START("/fxml/health_start.fxml"), // diff --git a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogComponent.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndComponent.java similarity index 59% rename from src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogComponent.java rename to src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndComponent.java index 802a4e62b..48a5ab36c 100644 --- a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogComponent.java +++ b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndComponent.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.dokanysupportenddialog; +package org.cryptomator.ui.dokanysupportend; import dagger.Lazy; import dagger.Subcomponent; @@ -8,14 +8,14 @@ import org.cryptomator.ui.common.FxmlScene; import javafx.scene.Scene; import javafx.stage.Stage; -@DokanySupportEndDialogScoped -@Subcomponent(modules = {DokanySupportEndDialogModule.class}) -public interface DokanySupportEndDialogComponent { +@DokanySupportEndScoped +@Subcomponent(modules = {DokanySupportEndModule.class}) +public interface DokanySupportEndComponent { - @DokanySupportEndDialogWindow + @DokanySupportEndWindow Stage window(); - @FxmlScene(FxmlFile.DOKANY_SUPPORT_END_DIALOG) + @FxmlScene(FxmlFile.DOKANY_SUPPORT_END) Lazy dokanySupportEndScene(); @@ -29,6 +29,6 @@ public interface DokanySupportEndDialogComponent { @Subcomponent.Factory interface Factory { - DokanySupportEndDialogComponent create(); + DokanySupportEndComponent create(); } } \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogController.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndController.java similarity index 68% rename from src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogController.java rename to src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndController.java index 6b5aad18a..a1d626402 100644 --- a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogController.java +++ b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndController.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.dokanysupportenddialog; +package org.cryptomator.ui.dokanysupportend; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.fxapp.FxApplicationWindows; @@ -9,14 +9,14 @@ import javafx.fxml.FXML; import javafx.stage.Stage; -@DokanySupportEndDialogScoped -public class DokanySupportEndDialogController implements FxController { +@DokanySupportEndScoped +public class DokanySupportEndController implements FxController { private final Stage window; private final FxApplicationWindows applicationWindows; @Inject - DokanySupportEndDialogController(@DokanySupportEndDialogWindow Stage window, FxApplicationWindows applicationWindows) { + DokanySupportEndController(@DokanySupportEndWindow Stage window, FxApplicationWindows applicationWindows) { this.window = window; this.applicationWindows = applicationWindows; } diff --git a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogModule.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndModule.java similarity index 66% rename from src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogModule.java rename to src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndModule.java index 1ab20be2e..64689eb26 100644 --- a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogModule.java +++ b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndModule.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.dokanysupportenddialog; +package org.cryptomator.ui.dokanysupportend; import dagger.Binds; import dagger.Module; @@ -20,18 +20,18 @@ import java.util.Map; import java.util.ResourceBundle; @Module -abstract class DokanySupportEndDialogModule { +abstract class DokanySupportEndModule { @Provides - @DokanySupportEndDialogWindow - @DokanySupportEndDialogScoped + @DokanySupportEndWindow + @DokanySupportEndScoped static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides - @DokanySupportEndDialogWindow - @DokanySupportEndDialogScoped + @DokanySupportEndWindow + @DokanySupportEndScoped static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle) { Stage stage = factory.create(); stage.setTitle(resourceBundle.getString("dokanySupportEnd.title")); @@ -42,16 +42,16 @@ abstract class DokanySupportEndDialogModule { } @Provides - @FxmlScene(FxmlFile.DOKANY_SUPPORT_END_DIALOG) - @DokanySupportEndDialogScoped - static Scene provideDokanySupportEndDialogScene(@DokanySupportEndDialogWindow FxmlLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.DOKANY_SUPPORT_END_DIALOG); + @FxmlScene(FxmlFile.DOKANY_SUPPORT_END) + @DokanySupportEndScoped + static Scene provideDokanySupportEndScene(@DokanySupportEndWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.DOKANY_SUPPORT_END); } @Binds @IntoMap - @FxControllerKey(DokanySupportEndDialogController.class) - abstract FxController bindDokanySupportEndDialogController(DokanySupportEndDialogController controller); + @FxControllerKey(DokanySupportEndController.class) + abstract FxController bindDokanySupportEndController(DokanySupportEndController controller); } diff --git a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogScoped.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndScoped.java similarity index 69% rename from src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogScoped.java rename to src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndScoped.java index 2dce60243..967e6f86f 100644 --- a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogScoped.java +++ b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndScoped.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.dokanysupportenddialog; +package org.cryptomator.ui.dokanysupportend; import javax.inject.Scope; import java.lang.annotation.Documented; @@ -8,6 +8,6 @@ import java.lang.annotation.RetentionPolicy; @Scope @Documented @Retention(RetentionPolicy.RUNTIME) -@interface DokanySupportEndDialogScoped { +@interface DokanySupportEndScoped { } diff --git a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogWindow.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndWindow.java similarity index 70% rename from src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogWindow.java rename to src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndWindow.java index f99dc3019..bb9b1617c 100644 --- a/src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogWindow.java +++ b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndWindow.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.dokanysupportenddialog; +package org.cryptomator.ui.dokanysupportend; import javax.inject.Qualifier; import java.lang.annotation.Documented; @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -@interface DokanySupportEndDialogWindow { +@interface DokanySupportEndWindow { } diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java index 7167ffcff..0b8b6c70f 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java @@ -7,7 +7,7 @@ package org.cryptomator.ui.fxapp; import dagger.Module; import dagger.Provides; -import org.cryptomator.ui.dokanysupportenddialog.DokanySupportEndDialogComponent; +import org.cryptomator.ui.dokanysupportend.DokanySupportEndComponent; import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.health.HealthCheckComponent; import org.cryptomator.ui.lock.LockComponent; @@ -34,7 +34,7 @@ import java.io.InputStream; ErrorComponent.class, // HealthCheckComponent.class, // UpdateReminderComponent.class, // - DokanySupportEndDialogComponent.class, // + DokanySupportEndComponent.class, // ShareVaultComponent.class}) abstract class FxApplicationModule { diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java index ba9afe792..33d8491a7 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java @@ -5,7 +5,7 @@ import dagger.Lazy; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultState; import org.cryptomator.integrations.tray.TrayIntegrationProvider; -import org.cryptomator.ui.dokanysupportenddialog.DokanySupportEndDialogComponent; +import org.cryptomator.ui.dokanysupportend.DokanySupportEndComponent; import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.lock.LockComponent; import org.cryptomator.ui.mainwindow.MainWindowComponent; @@ -49,7 +49,7 @@ public class FxApplicationWindows { private final QuitComponent.Builder quitWindowBuilder; private final UnlockComponent.Factory unlockWorkflowFactory; private final UpdateReminderComponent.Factory updateReminderWindowBuilder; - private final DokanySupportEndDialogComponent.Factory dokanySupportEndWindowBuilder; + private final DokanySupportEndComponent.Factory dokanySupportEndWindowBuilder; private final LockComponent.Factory lockWorkflowFactory; private final ErrorComponent.Factory errorWindowFactory; private final ExecutorService executor; @@ -65,7 +65,7 @@ public class FxApplicationWindows { QuitComponent.Builder quitWindowBuilder, // UnlockComponent.Factory unlockWorkflowFactory, // UpdateReminderComponent.Factory updateReminderWindowBuilder, // - DokanySupportEndDialogComponent.Factory dokanySupportEndWindowBuilder, // + DokanySupportEndComponent.Factory dokanySupportEndWindowBuilder, // LockComponent.Factory lockWorkflowFactory, // ErrorComponent.Factory errorWindowFactory, // VaultOptionsComponent.Factory vaultOptionsWindow, // diff --git a/src/main/resources/fxml/dokany_support_end.fxml b/src/main/resources/fxml/dokany_support_end.fxml index 0a09b8db3..423a54c72 100644 --- a/src/main/resources/fxml/dokany_support_end.fxml +++ b/src/main/resources/fxml/dokany_support_end.fxml @@ -13,7 +13,7 @@