mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-28 07:30:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

using vaultlist from parent scope, no need to duplicate variable in subscope

Browse Source
This commit is contained in:
Sebastian Stenzel
2019-07-25 12:29:14 +02:00
parent d0062b7e22
commit 87c654b43d
4 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
View File

@@ -6,7 +6,6 @@ import dagger.Provides;
import dagger.multibindings.IntoMap;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.collections.ObservableList;
import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
@@ -14,7 +13,6 @@ import org.cryptomator.ui.common.FXMLLoaderFactory;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.common.FxControllerKey;
import org.cryptomator.ui.mainwindow.MainWindow;
import org.cryptomator.ui.model.Vault;
import javax.inject.Provider;
import java.nio.file.Path;
@@ -50,12 +48,6 @@ public abstract class AddVaultModule {
return new SimpleObjectProperty<>();
}
@Provides
@AddVaultWizardScoped
static ObservableList<Vault> provideVaults(@AddVaultWizard ObservableList<Vault> vaults) {
return vaults;
}
// ------------------
@Binds

6
main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java
View File

@@ -5,12 +5,9 @@
*******************************************************************************/
package org.cryptomator.ui.addvaultwizard;
import dagger.BindsInstance;
import dagger.Subcomponent;
import javafx.collections.ObservableList;
import javafx.stage.Stage;
import org.cryptomator.ui.common.FXMLLoaderFactory;
import org.cryptomator.ui.model.Vault;
@AddVaultWizardScoped
@Subcomponent(modules = {AddVaultModule.class})
@@ -32,9 +29,6 @@ public interface AddVaultWizardComponent {
@Subcomponent.Builder
interface Builder {
@BindsInstance
Builder vaults(@AddVaultWizard ObservableList<Vault> vaults);
AddVaultWizardComponent build();
}

2
main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java
View File

@@ -25,7 +25,7 @@ public class ChooseExistingVaultController implements FxController {
private final VaultFactory vaultFactory;
@Inject
ChooseExistingVaultController(@AddVaultWizard Stage window, @AddVaultWizard FXMLLoaderFactory fxmlLoaders, ObjectProperty<Path> vaultPath, @AddVaultWizard ObservableList<Vault> vaults, VaultFactory vaultFactory) {
ChooseExistingVaultController(@AddVaultWizard Stage window, @AddVaultWizard FXMLLoaderFactory fxmlLoaders, ObjectProperty<Path> vaultPath, ObservableList<Vault> vaults, VaultFactory vaultFactory) {
this.window = window;
this.fxmlLoaders = fxmlLoaders;
this.vaultPath = vaultPath;

2
main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
View File

@@ -41,7 +41,7 @@ public class VaultListController implements FxController {
}
public void didClickAddVault() {
addVaultWizard.vaults(vaults).build().showAddVaultWizard();
addVaultWizard.build().showAddVaultWizard();
}
public void didClickRemoveVault() {