Fix issue 9863 - Change Tab selection order

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

@@ -79,6 +79,7 @@
 import org.jabref.gui.externalfiles.AutoLinkFilesAction;
 import org.jabref.gui.externalfiles.DownloadFullTextAction;
 import org.jabref.gui.externalfiles.FindUnlinkedFilesAction;
+import org.jabref.gui.groups.GroupTreeView;
 import org.jabref.gui.help.AboutAction;
 import org.jabref.gui.help.ErrorConsoleAction;
 import org.jabref.gui.help.HelpAction;
@@ -321,7 +322,7 @@ private void initKeyBindings() {
                         event.consume();
                         break;
                     case FOCUS_GROUP_LIST:
-                        this.stateManager.getGroupTree().requestFocus();
+                        getGroupTreeView().getGroupTree().requestFocus();
                         event.consume();
                     break;
                     case NEXT_LIBRARY:
@@ -739,6 +740,21 @@ public LibraryTab getCurrentLibraryTab() {
         return (LibraryTab) tabbedPane.getSelectionModel().getSelectedItem();
     }
 
+    /**
+     * Returns groupTreeView.
+     */
+    public GroupTreeView getGroupTreeView() {
+        GroupTreeView groupTreeView = null;
+
+        for (Node child : sidePane.getSidePaneComponent(SidePaneType.GROUPS).getChildren()) {
+            if (child instanceof GroupTreeView) {
+                groupTreeView = (GroupTreeView) child;
+                break;
+            }
+        }
+        return groupTreeView;
+    }
+
     /**
      * @return the BasePanel count.
      */

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

@@ -99,8 +99,6 @@ public OptionalObjectProperty<SearchQuery> activeSearchQueryProperty() {
         return activeSearchQuery;
     }
 
-    private TreeTableView<GroupNodeViewModel> groupTree;
-
     public void setActiveSearchResultSize(BibDatabaseContext database, IntegerProperty resultSize) {
         searchResultMap.put(database, resultSize);
     }
@@ -240,11 +238,4 @@ public void clearSearchHistory() {
         searchHistory.clear();
     }
 
-    public void setGroupTree(TreeTableView<GroupNodeViewModel> groupTree) {
-        this.groupTree = groupTree;
-    }
-
-    public TreeTableView<GroupNodeViewModel> getGroupTree() {
-        return this.groupTree;
-    }
 }

src/main/java/org/jabref/gui/groups/GroupTreeView.java

@@ -251,9 +251,6 @@ private void initialize() {
 
         // Filter text field
         setupClearButtonField(searchField);
-
-        // set GroupTree in StateManger
-        this.stateManager.setGroupTree(this.groupTree);
     }
 
     private StackPane getArrowCell(GroupNodeViewModel viewModel) {
@@ -612,4 +609,11 @@ public void execute() {
             }
         }
     }
+
+    /**
+     * Returns GroupTree
+     */
+    public TreeTableView<GroupNodeViewModel> getGroupTree() {
+        return groupTree;
+    }
 }

src/main/java/org/jabref/gui/sidepane/SidePane.java

@@ -57,4 +57,8 @@ public BooleanBinding paneVisibleBinding(SidePaneType pane) {
     public SimpleCommand getToggleCommandFor(SidePaneType sidePane) {
         return new TogglePaneAction(stateManager, sidePane, preferencesService.getSidePanePreferences());
     }
+
+    public SidePaneComponent getSidePaneComponent(SidePaneType type) {
+        return viewModel.getSidePaneComponent(type);
+    }
 }