Make activeTab observable

JabRef · Nov 30, 2024 · f247c7c · f247c7c
1 parent 5bac391
commit f247c7c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/org/jabref/gui/LibraryTabContainer.java b/src/main/java/org/jabref/gui/LibraryTabContainer.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import javafx.collections.ObservableList;
+
 import org.jabref.model.database.BibDatabaseContext;
 
 import org.jspecify.annotations.NonNull;
@@ -10,7 +12,7 @@
 
 @NullMarked
 public interface LibraryTabContainer {
-    List<LibraryTab> getLibraryTabs();
+    ObservableList<LibraryTab> getLibraryTabs();
 
     @Nullable
     LibraryTab getCurrentLibraryTab();

diff --git a/src/main/java/org/jabref/gui/frame/JabRefFrame.java b/src/main/java/org/jabref/gui/frame/JabRefFrame.java
@@ -12,6 +12,7 @@
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.StringBinding;
+import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.event.Event;
 import javafx.geometry.Orientation;
@@ -454,11 +455,8 @@ private void initBindings() {
     /**
      * Returns a list of all LibraryTabs in this frame.
      */
-    public @NonNull List<LibraryTab> getLibraryTabs() {
-        return tabbedPane.getTabs().stream()
-                         .filter(LibraryTab.class::isInstance)
-                         .map(LibraryTab.class::cast)
-                         .toList();
+    public @NonNull ObservableList<LibraryTab> getLibraryTabs() {
+        return EasyBind.map(tabbedPane.getTabs().filtered(LibraryTab.class::isInstance), LibraryTab.class::cast);
     }
 
     /**

diff --git a/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java b/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.importer;
 
-import java.util.List;
+import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
@@ -40,7 +40,7 @@ void setUp() {
     void executeOnSuccessWithFixedType() {
         EntryType type = StandardEntryType.Article;
         newEntryAction = new NewEntryAction(() -> libraryTab, type, dialogService, preferences, stateManager);
-        when(tabContainer.getLibraryTabs()).thenReturn(List.of(libraryTab));
+        when(tabContainer.getLibraryTabs()).thenReturn(FXCollections.observableArrayList(libraryTab));
 
         newEntryAction.execute();
         verify(libraryTab, times(1)).insertEntry(new BibEntry(type));