From fe722629bed1aaba80a6bb2fca60c1a52cc78714 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 26 Feb 2019 12:15:15 +0100 Subject: [PATCH] moved vault upgrade classes to custom package with custom log config --- .../org/cryptomator/ui/controllers/MainController.java | 4 ++-- .../org/cryptomator/ui/controllers/UpgradeController.java | 6 +++--- .../ui/model/{ => upgrade}/UpgradeStrategies.java | 3 ++- .../ui/model/{ => upgrade}/UpgradeStrategy.java | 3 ++- .../{ => upgrade}/UpgradeVersion3DropBundleExtension.java | 3 ++- .../ui/model/{ => upgrade}/UpgradeVersion3to4.java | 3 ++- .../ui/model/{ => upgrade}/UpgradeVersion4to5.java | 3 ++- .../ui/model/{ => upgrade}/UpgradeVersion5toX.java | 3 ++- .../ui/model/{ => upgrade}/UpgradeVersion3to4Test.java | 7 +++++-- 9 files changed, 22 insertions(+), 13 deletions(-) rename main/ui/src/main/java/org/cryptomator/ui/model/{ => upgrade}/UpgradeStrategies.java (93%) rename main/ui/src/main/java/org/cryptomator/ui/model/{ => upgrade}/UpgradeStrategy.java (98%) rename main/ui/src/main/java/org/cryptomator/ui/model/{ => upgrade}/UpgradeVersion3DropBundleExtension.java (97%) rename main/ui/src/main/java/org/cryptomator/ui/model/{ => upgrade}/UpgradeVersion3to4.java (98%) rename main/ui/src/main/java/org/cryptomator/ui/model/{ => upgrade}/UpgradeVersion4to5.java (98%) rename main/ui/src/main/java/org/cryptomator/ui/model/{ => upgrade}/UpgradeVersion5toX.java (96%) rename main/ui/src/test/java/org/cryptomator/ui/model/{ => upgrade}/UpgradeVersion3to4Test.java (95%) 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 7fc86867e..e94a02f53 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 @@ -52,8 +52,8 @@ import org.cryptomator.ui.controls.DirectoryListCell; import org.cryptomator.ui.l10n.Localization; import org.cryptomator.ui.model.AppLaunchEvent; import org.cryptomator.ui.model.AutoUnlocker; -import org.cryptomator.ui.model.UpgradeStrategies; -import org.cryptomator.ui.model.UpgradeStrategy; +import org.cryptomator.ui.model.upgrade.UpgradeStrategies; +import org.cryptomator.ui.model.upgrade.UpgradeStrategy; import org.cryptomator.ui.model.Vault; import org.cryptomator.ui.model.VaultFactory; import org.cryptomator.ui.model.VaultList; diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java index 1eb0c7307..49e9295bf 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java @@ -22,9 +22,9 @@ import javafx.scene.control.Label; import javafx.scene.control.ProgressIndicator; import javafx.scene.layout.GridPane; import org.cryptomator.ui.controls.SecPasswordField; -import org.cryptomator.ui.model.UpgradeStrategies; -import org.cryptomator.ui.model.UpgradeStrategy; -import org.cryptomator.ui.model.UpgradeStrategy.UpgradeFailedException; +import org.cryptomator.ui.model.upgrade.UpgradeStrategies; +import org.cryptomator.ui.model.upgrade.UpgradeStrategy; +import org.cryptomator.ui.model.upgrade.UpgradeStrategy.UpgradeFailedException; import org.cryptomator.ui.model.Vault; import org.cryptomator.ui.util.Tasks; import org.fxmisc.easybind.EasyBind; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategies.java similarity index 93% rename from main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java rename to main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategies.java index dbf9f67d3..d90a6e5a7 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategies.java @@ -3,9 +3,10 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the accompanying LICENSE file. *******************************************************************************/ -package org.cryptomator.ui.model; +package org.cryptomator.ui.model.upgrade; import org.cryptomator.common.FxApplicationScoped; +import org.cryptomator.ui.model.Vault; import javax.inject.Inject; import java.util.Arrays; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategy.java similarity index 98% rename from main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java rename to main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategy.java index 29c51ff2b..14c0a7109 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeStrategy.java @@ -3,7 +3,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the accompanying LICENSE file. *******************************************************************************/ -package org.cryptomator.ui.model; +package org.cryptomator.ui.model.upgrade; import java.io.IOException; import java.nio.file.Files; @@ -19,6 +19,7 @@ import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.cryptolib.api.KeyFile; import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException; import org.cryptomator.ui.l10n.Localization; +import org.cryptomator.ui.model.Vault; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3DropBundleExtension.java similarity index 97% rename from main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java rename to main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3DropBundleExtension.java index d3b48a991..a2456f81f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3DropBundleExtension.java @@ -3,7 +3,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the accompanying LICENSE file. *******************************************************************************/ -package org.cryptomator.ui.model; +package org.cryptomator.ui.model.upgrade; import javafx.application.Platform; import org.apache.commons.lang3.StringUtils; @@ -11,6 +11,7 @@ import org.cryptomator.common.FxApplicationScoped; import org.cryptomator.cryptolib.Cryptors; import org.cryptomator.cryptolib.api.Cryptor; import org.cryptomator.ui.l10n.Localization; +import org.cryptomator.ui.model.Vault; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4.java similarity index 98% rename from main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java rename to main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4.java index e68293360..db3350fe8 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4.java @@ -3,7 +3,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the accompanying LICENSE file. *******************************************************************************/ -package org.cryptomator.ui.model; +package org.cryptomator.ui.model.upgrade; import com.google.common.io.BaseEncoding; import org.apache.commons.lang3.StringUtils; @@ -12,6 +12,7 @@ import org.cryptomator.cryptolib.Cryptors; import org.cryptomator.cryptolib.api.Cryptor; import org.cryptomator.cryptolib.common.MessageDigestSupplier; import org.cryptomator.ui.l10n.Localization; +import org.cryptomator.ui.model.Vault; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion4to5.java similarity index 98% rename from main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java rename to main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion4to5.java index da421f448..b64fbdb7f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion4to5.java @@ -3,13 +3,14 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the accompanying LICENSE file. *******************************************************************************/ -package org.cryptomator.ui.model; +package org.cryptomator.ui.model.upgrade; import org.cryptomator.common.FxApplicationScoped; import org.cryptomator.cryptolib.Cryptors; import org.cryptomator.cryptolib.api.Cryptor; import org.cryptomator.cryptolib.api.FileHeader; import org.cryptomator.ui.l10n.Localization; +import org.cryptomator.ui.model.Vault; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion5toX.java b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion5toX.java similarity index 96% rename from main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion5toX.java rename to main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion5toX.java index 6707bdf5c..4e0bcfe64 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion5toX.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/upgrade/UpgradeVersion5toX.java @@ -3,7 +3,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the accompanying LICENSE file. *******************************************************************************/ -package org.cryptomator.ui.model; +package org.cryptomator.ui.model.upgrade; import org.cryptomator.common.FxApplicationScoped; import org.cryptomator.cryptofs.migration.Migrators; @@ -12,6 +12,7 @@ import org.cryptomator.cryptolib.Cryptors; import org.cryptomator.cryptolib.api.Cryptor; import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.ui.l10n.Localization; +import org.cryptomator.ui.model.Vault; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/ui/src/test/java/org/cryptomator/ui/model/UpgradeVersion3to4Test.java b/main/ui/src/test/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4Test.java similarity index 95% rename from main/ui/src/test/java/org/cryptomator/ui/model/UpgradeVersion3to4Test.java rename to main/ui/src/test/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4Test.java index b1d430ceb..9ea352462 100644 --- a/main/ui/src/test/java/org/cryptomator/ui/model/UpgradeVersion3to4Test.java +++ b/main/ui/src/test/java/org/cryptomator/ui/model/upgrade/UpgradeVersion3to4Test.java @@ -1,10 +1,13 @@ -package org.cryptomator.ui.model; +package org.cryptomator.ui.model.upgrade; import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; import org.cryptomator.ui.l10n.Localization; import org.cryptomator.ui.l10n.LocalizationMock; -import org.cryptomator.ui.model.UpgradeStrategy.UpgradeFailedException; +import org.cryptomator.ui.model.Vault; +import org.cryptomator.ui.model.upgrade.UpgradeStrategy; +import org.cryptomator.ui.model.upgrade.UpgradeStrategy.UpgradeFailedException; +import org.cryptomator.ui.model.upgrade.UpgradeVersion3to4; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach;