From f880db490212dc1dec3f7ca23803387da5c13501 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 10 Jul 2019 15:14:23 +0200 Subject: [PATCH] fixes #842 --- .../launcher/CleanShutdownPerformer.java | 24 +++++--- .../org/cryptomator/launcher/Cryptomator.java | 56 +++++++------------ .../launcher/CryptomatorComponent.java | 3 +- .../launcher/CryptomatorModule.java | 16 ++++++ .../launcher/FxApplicationComponent.java | 36 ------------ .../java/org/cryptomator/ui/ExitUtil.java | 1 - .../org/cryptomator/ui/FxApplication.java | 39 +++++++++++++ .../ui/FxApplicationComponent.java | 16 ++++++ .../cryptomator/ui}/FxApplicationModule.java | 23 +++++--- .../cryptomator/ui}/FxApplicationScoped.java | 2 +- .../java/org/cryptomator/ui/UiModule.java | 1 - .../ui/controllers/MainController.java | 2 +- .../ui/controllers/NotFoundController.java | 2 +- .../ui/controllers/SettingsController.java | 3 +- .../ui/controllers/ViewControllerLoader.java | 2 +- .../ui/controllers/WelcomeController.java | 2 +- .../org/cryptomator/ui/l10n/Localization.java | 2 +- .../cryptomator/ui/model/AutoUnlocker.java | 2 +- .../cryptomator/ui/model/VaultFactory.java | 2 +- .../org/cryptomator/ui/model/VaultList.java | 2 +- .../ui/model/WindowsDriveLetters.java | 2 +- .../ui/model/upgrade/UpgradeStrategies.java | 2 +- .../UpgradeVersion3DropBundleExtension.java | 2 +- .../ui/model/upgrade/UpgradeVersion3to4.java | 2 +- .../ui/model/upgrade/UpgradeVersion4to5.java | 2 +- .../ui/model/upgrade/UpgradeVersion5toX.java | 2 +- .../ui/util/PasswordStrengthUtil.java | 2 +- 27 files changed, 142 insertions(+), 108 deletions(-) delete mode 100644 main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java create mode 100644 main/ui/src/main/java/org/cryptomator/ui/FxApplication.java create mode 100644 main/ui/src/main/java/org/cryptomator/ui/FxApplicationComponent.java rename main/{launcher/src/main/java/org/cryptomator/launcher => ui/src/main/java/org/cryptomator/ui}/FxApplicationModule.java (55%) rename main/{commons/src/main/java/org/cryptomator/common => ui/src/main/java/org/cryptomator/ui}/FxApplicationScoped.java (88%) diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/CleanShutdownPerformer.java b/main/launcher/src/main/java/org/cryptomator/launcher/CleanShutdownPerformer.java index 8a2c23dcc..717fb86a8 100644 --- a/main/launcher/src/main/java/org/cryptomator/launcher/CleanShutdownPerformer.java +++ b/main/launcher/src/main/java/org/cryptomator/launcher/CleanShutdownPerformer.java @@ -11,30 +11,38 @@ import java.util.concurrent.ConcurrentMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.inject.Inject; +import javax.inject.Singleton; + +@Singleton class CleanShutdownPerformer extends Thread { private static final Logger LOG = LoggerFactory.getLogger(CleanShutdownPerformer.class); - static final ConcurrentMap SHUTDOWN_TASKS = new ConcurrentHashMap<>(); + private final ConcurrentMap tasks = new ConcurrentHashMap<>(); + + @Inject + CleanShutdownPerformer() { + super(null, null, "ShutdownTasks", 0); + } @Override public void run() { LOG.debug("Running graceful shutdown tasks..."); - SHUTDOWN_TASKS.keySet().forEach(r -> { + tasks.keySet().forEach(r -> { try { r.run(); } catch (RuntimeException e) { LOG.error("Exception while shutting down.", e); } }); - SHUTDOWN_TASKS.clear(); - LOG.info("Goodbye."); + tasks.clear(); } - static void scheduleShutdownTask(Runnable task) { - SHUTDOWN_TASKS.put(task, Boolean.TRUE); + void scheduleShutdownTask(Runnable task) { + tasks.put(task, Boolean.TRUE); } - static void registerShutdownHook() { - Runtime.getRuntime().addShutdownHook(new CleanShutdownPerformer()); + void registerShutdownHook() { + Runtime.getRuntime().addShutdownHook(this); } } \ No newline at end of file diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java b/main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java index 8651553e3..71f43a100 100644 --- a/main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java +++ b/main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java @@ -5,12 +5,11 @@ *******************************************************************************/ package org.cryptomator.launcher; -import javafx.application.Application; -import javafx.stage.Stage; +import javafx.application.Platform; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.logging.DebugMode; import org.cryptomator.logging.LoggerConfiguration; -import org.cryptomator.ui.controllers.MainController; +import org.cryptomator.ui.FxApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,6 +18,7 @@ import javax.inject.Named; import javax.inject.Singleton; import java.io.IOException; import java.util.Optional; +import java.util.concurrent.CountDownLatch; @Singleton public class Cryptomator { @@ -32,13 +32,17 @@ public class Cryptomator { private final DebugMode debugMode; private final IpcFactory ipcFactory; private final Optional applicationVersion; + private final CountDownLatch shutdownLatch; + private final CleanShutdownPerformer shutdownPerformer; @Inject - Cryptomator(LoggerConfiguration logConfig, DebugMode debugMode, IpcFactory ipcFactory, @Named("applicationVersion") Optional applicationVersion) { + Cryptomator(LoggerConfiguration logConfig, DebugMode debugMode, IpcFactory ipcFactory, @Named("applicationVersion") Optional applicationVersion, @Named("shutdownLatch") CountDownLatch shutdownLatch, CleanShutdownPerformer shutdownPerformer) { this.logConfig = logConfig; this.debugMode = debugMode; this.ipcFactory = ipcFactory; this.applicationVersion = applicationVersion; + this.shutdownLatch = shutdownLatch; + this.shutdownPerformer = shutdownPerformer; } public static void main(String[] args) { @@ -48,6 +52,7 @@ public class Cryptomator { /** * Main entry point of the application launcher. + * * @param args The arguments passed to this program via {@link #main(String[])}. * @return Nonzero exit code in case of an error. */ @@ -77,45 +82,26 @@ public class Cryptomator { /** * Launches the JavaFX application and waits until shutdown is requested. + * * @return Nonzero exit code in case of an error. + * @implNote This method blocks until {@link #shutdownLatch} reached zero. */ private int runGuiApplication() { try { - CleanShutdownPerformer.registerShutdownHook(); - Application.launch(MainApp.class); - LOG.info("Shutting down..."); + shutdownPerformer.registerShutdownHook(); + Platform.startup(() -> { + assert Platform.isFxApplicationThread(); + FxApplication app = CRYPTOMATOR_COMPONENT.fxApplicationComponent().application(); + app.start(); + }); + shutdownLatch.await(); + LOG.info("UI shut down"); return 0; - } catch (Throwable e) { - LOG.error("Terminating due to error", e); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); return 1; } } - // We need a separate FX Application class, until we can use the module system. See https://stackoverflow.com/q/54756176/4014509 - public static class MainApp extends Application { - - @Override - public void start(Stage primaryStage) { - LOG.info("JavaFX application started."); - primaryStage.setMinWidth(652.0); - primaryStage.setMinHeight(440.0); - - FxApplicationComponent fxApplicationComponent = CRYPTOMATOR_COMPONENT.fxApplicationComponent() // - .fxApplication(this) // - .mainWindow(primaryStage) // - .build(); - - MainController mainCtrl = fxApplicationComponent.fxmlLoader().load("/fxml/main.fxml"); - mainCtrl.initStage(primaryStage); - primaryStage.show(); - } - - @Override - public void stop() { - LOG.info("JavaFX application stopped."); - } - - } - } diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java b/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java index 6d5c47b05..251e0ce48 100644 --- a/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java +++ b/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java @@ -3,6 +3,7 @@ package org.cryptomator.launcher; import dagger.Component; import org.cryptomator.common.CommonsModule; import org.cryptomator.logging.LoggerModule; +import org.cryptomator.ui.FxApplicationComponent; import javax.inject.Singleton; @@ -12,6 +13,6 @@ public interface CryptomatorComponent { Cryptomator application(); - FxApplicationComponent.Builder fxApplicationComponent(); + FxApplicationComponent fxApplicationComponent(); } diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java b/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java index 2fe1f393a..37c8b2216 100644 --- a/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java +++ b/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java @@ -4,6 +4,7 @@ import dagger.Module; import dagger.Provides; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.SettingsProvider; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.ui.model.AppLaunchEvent; import javax.inject.Named; @@ -12,10 +13,25 @@ import java.util.Optional; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; +import java.util.function.Consumer; @Module class CryptomatorModule { + @Provides + @Singleton + @Named("shutdownTaskScheduler") + Consumer provideShutdownTaskScheduler(CleanShutdownPerformer shutdownPerformer) { + return shutdownPerformer::scheduleShutdownTask; + } + + @Provides + @Singleton + @Named("shutdownLatch") + static CountDownLatch provideShutdownLatch() { + return new CountDownLatch(1); + } + @Provides @Singleton static Settings provideSettings(SettingsProvider settingsProvider) { diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java b/main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java deleted file mode 100644 index 562151f43..000000000 --- a/main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt). - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the accompanying LICENSE file. - *******************************************************************************/ -package org.cryptomator.launcher; - -import dagger.BindsInstance; -import dagger.Subcomponent; -import javafx.application.Application; -import javafx.stage.Stage; -import org.cryptomator.common.FxApplicationScoped; -import org.cryptomator.ui.controllers.ViewControllerLoader; - -import javax.inject.Named; - -@FxApplicationScoped -@Subcomponent(modules = FxApplicationModule.class) -interface FxApplicationComponent { - - ViewControllerLoader fxmlLoader(); - - @Subcomponent.Builder - interface Builder { - - @BindsInstance - Builder fxApplication(Application application); - - @BindsInstance - Builder mainWindow(@Named("mainWindow") Stage mainWindow); - - FxApplicationComponent build(); - - } - -} diff --git a/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java b/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java index ba51b6622..335f1d1ca 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java +++ b/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java @@ -12,7 +12,6 @@ package org.cryptomator.ui; import javafx.application.Platform; import javafx.stage.Stage; import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.common.FxApplicationScoped; import org.cryptomator.common.settings.Settings; import org.cryptomator.jni.JniException; import org.cryptomator.jni.MacApplicationUiState; diff --git a/main/ui/src/main/java/org/cryptomator/ui/FxApplication.java b/main/ui/src/main/java/org/cryptomator/ui/FxApplication.java new file mode 100644 index 000000000..f8136479f --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/FxApplication.java @@ -0,0 +1,39 @@ +package org.cryptomator.ui; + +import javafx.application.Application; +import javafx.stage.Stage; +import org.cryptomator.ui.controllers.MainController; +import org.cryptomator.ui.controllers.ViewControllerLoader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import javax.inject.Named; + +@FxApplicationScoped +public class FxApplication extends Application { + + private static final Logger LOG = LoggerFactory.getLogger(FxApplication.class); + + private final Stage primaryStage; + private final ViewControllerLoader fxmlLoader; + + @Inject + FxApplication(@Named("mainWindow") Stage primaryStage, ViewControllerLoader fxmlLoader) { + this.primaryStage = primaryStage; + this.fxmlLoader = fxmlLoader; + } + + public void start() { + LOG.info("Starting GUI..."); + start(primaryStage); + } + + @Override + public void start(Stage primaryStage) { + MainController mainCtrl = fxmlLoader.load("/fxml/main.fxml"); + mainCtrl.initStage(primaryStage); + primaryStage.show(); + } + +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/FxApplicationComponent.java b/main/ui/src/main/java/org/cryptomator/ui/FxApplicationComponent.java new file mode 100644 index 000000000..5b029a50c --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/FxApplicationComponent.java @@ -0,0 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt). + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the accompanying LICENSE file. + *******************************************************************************/ +package org.cryptomator.ui; + +import dagger.Subcomponent; + +@FxApplicationScoped +@Subcomponent(modules = FxApplicationModule.class) +public interface FxApplicationComponent { + + FxApplication application(); + +} diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationModule.java b/main/ui/src/main/java/org/cryptomator/ui/FxApplicationModule.java similarity index 55% rename from main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationModule.java rename to main/ui/src/main/java/org/cryptomator/ui/FxApplicationModule.java index 1d9988d06..5482dd189 100644 --- a/main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/FxApplicationModule.java @@ -3,24 +3,31 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the accompanying LICENSE file. *******************************************************************************/ -package org.cryptomator.launcher; +package org.cryptomator.ui; +import dagger.Binds; import dagger.Module; import dagger.Provides; -import org.cryptomator.common.FxApplicationScoped; -import org.cryptomator.ui.UiModule; +import javafx.application.Application; +import javafx.stage.Stage; import javax.inject.Named; -import java.util.function.Consumer; @Module(includes = {UiModule.class}) -class FxApplicationModule { +abstract class FxApplicationModule { @Provides @FxApplicationScoped - @Named("shutdownTaskScheduler") - Consumer provideShutdownTaskScheduler() { - return CleanShutdownPerformer::scheduleShutdownTask; + @Named("mainWindow") + static Stage providePrimaryStage() { + Stage stage = new Stage(); + stage.setMinWidth(652.0); + stage.setMinHeight(440.0); + return stage; } + @Binds + @FxApplicationScoped + abstract Application provideApplication(FxApplication application); + } diff --git a/main/commons/src/main/java/org/cryptomator/common/FxApplicationScoped.java b/main/ui/src/main/java/org/cryptomator/ui/FxApplicationScoped.java similarity index 88% rename from main/commons/src/main/java/org/cryptomator/common/FxApplicationScoped.java rename to main/ui/src/main/java/org/cryptomator/ui/FxApplicationScoped.java index dd90f4a38..e60c167df 100644 --- a/main/commons/src/main/java/org/cryptomator/common/FxApplicationScoped.java +++ b/main/ui/src/main/java/org/cryptomator/ui/FxApplicationScoped.java @@ -1,4 +1,4 @@ -package org.cryptomator.common; +package org.cryptomator.ui; import javax.inject.Scope; import java.lang.annotation.Documented; diff --git a/main/ui/src/main/java/org/cryptomator/ui/UiModule.java b/main/ui/src/main/java/org/cryptomator/ui/UiModule.java index b93c5ddae..6c09147e1 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/UiModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/UiModule.java @@ -12,7 +12,6 @@ import dagger.Module; import dagger.Provides; import javafx.beans.binding.Binding; import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.common.FxApplicationScoped; import org.cryptomator.common.settings.Settings; import org.cryptomator.frontend.webdav.WebDavServer; import org.cryptomator.keychain.KeychainModule; diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java index 9e435e389..59667a2fc 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java @@ -44,7 +44,7 @@ import javafx.stage.FileChooser; import javafx.stage.Stage; import javafx.util.Duration; import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.common.settings.VaultSettings; import org.cryptomator.ui.ExitUtil; import org.cryptomator.ui.controls.DirectoryListCell; diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/NotFoundController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/NotFoundController.java index 8d4408111..f579d51d0 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/NotFoundController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/NotFoundController.java @@ -8,7 +8,7 @@ package org.cryptomator.ui.controllers; import javafx.fxml.FXML; import javafx.scene.Parent; import javafx.scene.layout.VBox; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import javax.inject.Inject; diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java index f055573c5..b2af10cbe 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java @@ -12,7 +12,6 @@ import com.google.common.base.CharMatcher; import com.google.common.base.Strings; import javafx.beans.Observable; import javafx.beans.binding.Bindings; -import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.Group; import javafx.scene.Parent; @@ -25,7 +24,7 @@ import javafx.scene.input.KeyEvent; import javafx.scene.layout.VBox; import javafx.util.StringConverter; import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.VolumeImpl; import org.cryptomator.ui.l10n.Localization; diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java index 55f51db83..3e29d0f49 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java @@ -6,7 +6,7 @@ package org.cryptomator.ui.controllers; import javafx.fxml.FXMLLoader; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.ui.l10n.Localization; import javax.inject.Inject; diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java index 30d09b972..6e42e8e7a 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java @@ -23,7 +23,7 @@ import javafx.scene.control.Label; import javafx.scene.control.ProgressIndicator; import javafx.scene.layout.VBox; import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.common.settings.Settings; import org.cryptomator.ui.l10n.Localization; import org.cryptomator.ui.util.Tasks; diff --git a/main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java b/main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java index 565c3d371..edf470d88 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java +++ b/main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java @@ -7,7 +7,7 @@ package org.cryptomator.ui.l10n; import com.google.common.collect.Sets; import org.apache.commons.lang3.StringUtils; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/AutoUnlocker.java b/main/ui/src/main/java/org/cryptomator/ui/model/AutoUnlocker.java index b2909cb84..235a52b01 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/AutoUnlocker.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/AutoUnlocker.java @@ -5,7 +5,7 @@ *******************************************************************************/ package org.cryptomator.ui.model; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.cryptolib.api.CryptoException; import org.cryptomator.keychain.KeychainAccess; import org.slf4j.Logger; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultFactory.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultFactory.java index 6ee402e88..78351a5fd 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultFactory.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/VaultFactory.java @@ -8,7 +8,7 @@ *******************************************************************************/ package org.cryptomator.ui.model; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.common.settings.VaultSettings; import javax.inject.Inject; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultList.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultList.java index fb9c53afa..f5f7d8be4 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultList.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/VaultList.java @@ -9,7 +9,7 @@ import com.google.common.collect.Lists; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; import javafx.collections.transformation.TransformationList; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.VaultSettings; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java b/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java index 6b8bdef9b..c457deefd 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java @@ -6,7 +6,7 @@ package org.cryptomator.ui.model; import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategies.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategies.java index d90a6e5a7..239597e51 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategies.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategies.java @@ -5,7 +5,7 @@ *******************************************************************************/ package org.cryptomator.ui.model.upgrade; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.ui.model.Vault; import javax.inject.Inject; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3DropBundleExtension.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3DropBundleExtension.java index a2456f81f..084296a26 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3DropBundleExtension.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3DropBundleExtension.java @@ -7,7 +7,7 @@ package org.cryptomator.ui.model.upgrade; import javafx.application.Platform; import org.apache.commons.lang3.StringUtils; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.cryptolib.Cryptors; import org.cryptomator.cryptolib.api.Cryptor; import org.cryptomator.ui.l10n.Localization; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4.java index db3350fe8..7bd443a37 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4.java @@ -7,7 +7,7 @@ package org.cryptomator.ui.model.upgrade; import com.google.common.io.BaseEncoding; import org.apache.commons.lang3.StringUtils; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.cryptolib.Cryptors; import org.cryptomator.cryptolib.api.Cryptor; import org.cryptomator.cryptolib.common.MessageDigestSupplier; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion4to5.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion4to5.java index b64fbdb7f..907154e2e 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion4to5.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion4to5.java @@ -5,7 +5,7 @@ *******************************************************************************/ package org.cryptomator.ui.model.upgrade; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.cryptolib.Cryptors; import org.cryptomator.cryptolib.api.Cryptor; import org.cryptomator.cryptolib.api.FileHeader; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion5toX.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion5toX.java index 4e0bcfe64..ecc9f1a0c 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion5toX.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion5toX.java @@ -5,7 +5,7 @@ *******************************************************************************/ package org.cryptomator.ui.model.upgrade; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.cryptofs.migration.Migrators; import org.cryptomator.cryptofs.migration.api.NoApplicableMigratorException; import org.cryptomator.cryptolib.Cryptors; diff --git a/main/ui/src/main/java/org/cryptomator/ui/util/PasswordStrengthUtil.java b/main/ui/src/main/java/org/cryptomator/ui/util/PasswordStrengthUtil.java index 373f698d2..dea9114eb 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/util/PasswordStrengthUtil.java +++ b/main/ui/src/main/java/org/cryptomator/ui/util/PasswordStrengthUtil.java @@ -15,7 +15,7 @@ import javafx.scene.layout.Background; import javafx.scene.layout.BackgroundFill; import javafx.scene.layout.CornerRadii; import javafx.scene.paint.Color; -import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.FxApplicationScoped; import org.cryptomator.ui.l10n.Localization; import javax.inject.Inject;