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

Nice implementation of only one stats window per vault

Browse Source
This commit is contained in:
Martin Beyer
2020-08-26 17:23:39 +02:00
parent 65de6fef9b
commit ee81dca71c
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
View File

@@ -1,6 +1,8 @@
package org.cryptomator.ui.mainwindow;
import javafx.beans.property.BooleanProperty;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.ReadOnlyObjectProperty;
import javafx.fxml.FXML;
@@ -16,15 +18,22 @@ public class VaultDetailUnlockedController implements FxController {
private final ReadOnlyObjectProperty<Vault> vault;
private final VaultService vaultService;
private final LoadingCache<Vault, VaultStatisticsComponent> vaultStatisticsWindows;
private final VaultStatisticsComponent.Builder vaultStatisticsWindow;
@Inject
public VaultDetailUnlockedController(ObjectProperty<Vault> vault, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatisticsWindow) {
this.vault = vault;
this.vaultService = vaultService;
this.vaultStatisticsWindows = CacheBuilder.newBuilder().build(CacheLoader.from(this::provideVaultStatisticsComponent));
//TODO make the binding a weak Binding via weakValues
this.vaultStatisticsWindow = vaultStatisticsWindow;
}
private VaultStatisticsComponent provideVaultStatisticsComponent(Vault vault) {
return vaultStatisticsWindow.vault(vault).build();
}
@FXML
public void revealAccessLocation() {
vaultService.reveal(vault.get());
@@ -38,12 +47,7 @@ public class VaultDetailUnlockedController implements FxController {
@FXML
public void showVaultStatistics() {
//vaultStatisticsWindow.build()
BooleanProperty showingStats = vault.get().showingStatsProperty();
if (!showingStats.get()) {
vaultStatisticsWindow.vault(vault.get()).build().showVaultStatisticsWindow();
showingStats.setValue(true);
}
vaultStatisticsWindows.getUnchecked(vault.get()).showVaultStatisticsWindow();
}
/* Getter/Setter */

1
main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
View File

@@ -24,6 +24,7 @@ public interface VaultStatisticsComponent {
stage.setScene(scene().get());
stage.sizeToScene();
stage.show();
stage.requestFocus();
}
@Subcomponent.Builder