Extend implementation to per-tab

Author: subhramit

jabgui/src/main/java/org/jabref/gui/JabRefGuiStateManager.java

@@ -319,18 +319,4 @@ public BooleanProperty canGoBackProperty() {
     public BooleanProperty canGoForwardProperty() {
         return canGoForward;
     }
-
-    @Override
-    public void updateNavigationState(boolean canGoBack, boolean canGoForward) {
-        this.canGoBack.set(canGoBack);
-        this.canGoForward.set(canGoForward);
-    }
-
-    /**
-     * Called when switching tabs to reset navigation state
-     */
-    @Override
-    public void clearNavigationHistory() {
-        updateNavigationState(false, false);
-    }
 }

jabgui/src/main/java/org/jabref/gui/LibraryTab.java

@@ -122,6 +122,8 @@ public class LibraryTab extends Tab implements CommandSelectionTab {
     private final List<BibEntry> previousEntries = new ArrayList<>();
     private final List<BibEntry> nextEntries = new ArrayList<>();
     private BibEntry currentlyShowing;
+    private final BooleanProperty canGoBackProperty = new SimpleBooleanProperty(false);
+    private final BooleanProperty canGoForwardProperty = new SimpleBooleanProperty(false);
     private boolean backOrForwardInProgress = false;
 
 
@@ -1037,9 +1039,8 @@ private void newEntryShowing(BibEntry entry) {
      * Only update if this is the active tab
      */
     public void updateNavigationState() {
-        if (stateManager.activeTabProperty().get().filter(tab -> tab == this).isPresent()) {
-            stateManager.updateNavigationState(canGoBack(), canGoForward());
-        }
+        canGoBackProperty.set(canGoBack());
+        canGoForwardProperty.set(canGoForward());
     }
 
     /**
@@ -1112,6 +1113,14 @@ public static LibraryTab createLibraryTab(@NonNull BibDatabaseContext databaseCo
                 false);
     }
 
+    public BooleanProperty canGoBackProperty() {
+        return canGoBackProperty;
+    }
+
+    public BooleanProperty canGoForwardProperty() {
+        return canGoForwardProperty;
+    }
+
     private class GroupTreeListener {
 
         @Subscribe

jabgui/src/main/java/org/jabref/gui/StateManager.java

@@ -112,8 +112,4 @@ public interface StateManager extends SrvStateManager {
     BooleanProperty canGoBackProperty();
 
     BooleanProperty canGoForwardProperty();
-
-    void updateNavigationState(boolean canGoBack, boolean canGoForward);
-
-    void clearNavigationHistory();
 }

jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java

@@ -11,6 +11,7 @@
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
@@ -419,8 +420,6 @@ private void initBindings() {
                 // Listen for auto-completer changes after real context is loaded
                 libraryTab.setAutoCompleterChangedListener(() -> globalSearchBar.setAutoCompleter(libraryTab.getAutoCompleter()));
 
-                libraryTab.updateNavigationState();
-
                 // [impl->req~maintable.focus~1]
                 Platform.runLater(() -> libraryTab.getMainTable().requestFocus());
 
@@ -444,7 +443,6 @@ private void initBindings() {
                 stateManager.setActiveDatabase(null);
                 stateManager.activeTabProperty().set(Optional.empty());
                 stateManager.setSelectedEntries(List.of());
-                stateManager.clearNavigationHistory();
                 mainStage.titleProperty().unbind();
                 mainStage.setTitle(FRAME_TITLE);
             }
@@ -463,6 +461,22 @@ private void initBindings() {
         // Hide tab bar
         stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) _ -> updateTabBarVisible());
         EasyBind.subscribe(preferences.getWorkspacePreferences().hideTabBarProperty(), _ -> updateTabBarVisible());
+
+        stateManager.canGoBackProperty().bind(
+                stateManager.activeTabProperty().flatMap(
+                        optionalTab -> optionalTab
+                                .map(LibraryTab::canGoBackProperty)
+                                .orElse(new SimpleBooleanProperty(false))
+                )
+        );
+
+        stateManager.canGoForwardProperty().bind(
+                stateManager.activeTabProperty().flatMap(
+                        optionalTab -> optionalTab
+                                .map(LibraryTab::canGoForwardProperty)
+                                .orElse(new SimpleBooleanProperty(false))
+                )
+        );
     }
 
     private void updateTabBarVisible() {