mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 01:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed dialog in naming

Browse Source
This commit is contained in:
Jan-Peter Klein
2024-06-14 14:20:18 +02:00
parent 8a8617b480
commit 6bb0328799
9 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"), //

14
src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogComponent.java → src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndComponent.java
View File

@@ -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<Scene> dokanySupportEndScene();
@@ -29,6 +29,6 @@ public interface DokanySupportEndDialogComponent {
@Subcomponent.Factory
interface Factory {
DokanySupportEndDialogComponent create();
DokanySupportEndComponent create();
}
}

8
src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogController.java → src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndController.java
View File

@@ -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;
}

24
src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogModule.java → src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndModule.java
View File

@@ -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<Class<? extends FxController>, Provider<FxController>> 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);
}

4
src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogScoped.java → src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndScoped.java
View File

@@ -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 {
}

4
src/main/java/org/cryptomator/ui/dokanysupportenddialog/DokanySupportEndDialogWindow.java → src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndWindow.java
View File

@@ -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 {
}

4
src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
View File

@@ -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 {

6
src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
View File

@@ -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, //