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

allow GCing of Stats Window while remaining reusability and preventing opening multiple windows per vault

Browse Source
This commit is contained in:
Sebastian Stenzel
2020-11-09 13:49:28 +01:00
parent 4e9af1c713
commit 4f4ddbc3e0
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,20 +18,19 @@ 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;
private final LoadingCache<Vault, VaultStatisticsComponent> vaultStats;
private final VaultStatisticsComponent.Builder vaultStatsBuilder;
@Inject
public VaultDetailUnlockedController(ObjectProperty<Vault> vault, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatisticsWindow) {
public VaultDetailUnlockedController(ObjectProperty<Vault> vault, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatsBuilder) {
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;
this.vaultStats = CacheBuilder.newBuilder().weakValues().build(CacheLoader.from(this::buildVaultStats));
this.vaultStatsBuilder = vaultStatsBuilder;
}
private VaultStatisticsComponent provideVaultStatisticsComponent(Vault vault) {
return vaultStatisticsWindow.vault(vault).build();
private VaultStatisticsComponent buildVaultStats(Vault vault) {
return vaultStatsBuilder.vault(vault).build();
}
@FXML
@@ -47,7 +46,7 @@ public class VaultDetailUnlockedController implements FxController {
@FXML
public void showVaultStatistics() {
vaultStatisticsWindows.getUnchecked(vault.get()).showVaultStatisticsWindow();
vaultStats.getUnchecked(vault.get()).showVaultStatisticsWindow();
}
/* Getter/Setter */

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

@@ -3,12 +3,22 @@ package org.cryptomator.ui.stats;
import dagger.BindsInstance;
import dagger.Lazy;
import dagger.Subcomponent;
import javafx.scene.Scene;
import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
import javafx.scene.Scene;
import javafx.stage.Stage;
/**
* For each vault there can be up to one statistics component.
* <p>
* <b>Important:</b> Outside of {@link org.cryptomator.ui.stats}, this component should be weakly referenced,
* as it include memory-intensive UI nodes.
* <p>
* While the stats window is visible, this component is strongly referenced by the window's main controller.
* As soon as the window is closed, the full objectgraph becomes eligible for GC.
*/
@VaultStatisticsScoped
@Subcomponent(modules = {VaultStatisticsModule.class})
public interface VaultStatisticsComponent {

11
main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
View File

@@ -28,6 +28,7 @@ public class VaultStatisticsController implements FxController {
private static final int IO_SAMPLING_STEPS = 30;
private static final double IO_SAMPLING_INTERVAL = 1;
private final VaultStatisticsComponent component; // keep a strong reference to the component (see component's javadoc)
private final VaultStats stats;
private final Series<Number, Number> readData;
private final Series<Number, Number> writeData;
@@ -54,7 +55,8 @@ public class VaultStatisticsController implements FxController {
public NumberAxis writeChartYAxis;
@Inject
public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
public VaultStatisticsController(VaultStatisticsComponent component, @VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
this.component = component;
this.stats = vault.getStats();
this.readData = new Series<>();
this.writeData = new Series<>();
@@ -77,11 +79,10 @@ public class VaultStatisticsController implements FxController {
ioAnimation.setCycleCount(Animation.INDEFINITE);
ioAnimation.play();
// make sure to stop animating,
// make sure to stop animating while window is closed
// otherwise a global timer (GC root) will keep a strong reference to animation
window.setOnHiding(evt -> {
ioAnimation.stop();
});
window.setOnHiding(evt -> ioAnimation.stop());
window.setOnShowing(evt -> ioAnimation.play());
}
@FXML