From dd724220f8ed21f6171215a56fac0aae2551c22a Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 21 Mar 2025 15:31:58 +0100 Subject: [PATCH] enable clear() again --- .../org/cryptomator/ui/eventview/EventViewController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/eventview/EventViewController.java b/src/main/java/org/cryptomator/ui/eventview/EventViewController.java index 994cf3441..18e9bdd8e 100644 --- a/src/main/java/org/cryptomator/ui/eventview/EventViewController.java +++ b/src/main/java/org/cryptomator/ui/eventview/EventViewController.java @@ -3,6 +3,7 @@ package org.cryptomator.ui.eventview; import org.cryptomator.common.vaults.Vault; import org.cryptomator.event.FSEventBucket; import org.cryptomator.event.FSEventBucketContent; +import org.cryptomator.event.FileSystemEventAggregator; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.fxapp.FxFSEventList; @@ -25,6 +26,7 @@ public class EventViewController implements FxController { private final FilteredList> filteredEventList; private final ObservableList vaults; + private final FileSystemEventAggregator aggregator; private final SortedList> sortedEventList; private final ObservableList choiceBoxEntries; private final ResourceBundle resourceBundle; @@ -36,9 +38,10 @@ public class EventViewController implements FxController { ListView> eventListView; @Inject - public EventViewController(FxFSEventList fxFSEventList, ObservableList vaults, ResourceBundle resourceBundle, EventListCellFactory cellFactory) { + public EventViewController(FxFSEventList fxFSEventList, ObservableList vaults, ResourceBundle resourceBundle, EventListCellFactory cellFactory, FileSystemEventAggregator aggregator) { this.filteredEventList = fxFSEventList.getObservableList().filtered(_ -> true); this.vaults = vaults; + this.aggregator = aggregator; this.sortedEventList = new SortedList<>(filteredEventList, this::compareBuckets); this.choiceBoxEntries = FXCollections.observableArrayList(); this.resourceBundle = resourceBundle; @@ -100,7 +103,7 @@ public class EventViewController implements FxController { @FXML void clearEvents() { - //fileSystemEventRegistry.clear(); + aggregator.clear(); } private static class VaultConverter extends StringConverter {