Refactor IoC - A: Extract Entry Editor

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

@@ -15,7 +15,8 @@ public class CoreGuiPreferences {
 
     private final BooleanProperty windowMaximised;
 
-    private final DoubleProperty sidePaneWidth;
+    private final DoubleProperty horizontalDividerPosition;
+    private final DoubleProperty verticalDividerPosition;
 
     private final StringProperty lastSelectedIdBasedFetcher;
 
@@ -25,14 +26,16 @@ public CoreGuiPreferences(double positionX,
                               double sizeY,
                               boolean windowMaximised,
                               String lastSelectedIdBasedFetcher,
-                              double sidePaneWidth) {
+                              double horizontalDividerPosition,
+                              double verticalDividerPosition) {
         this.positionX = new SimpleDoubleProperty(positionX);
         this.positionY = new SimpleDoubleProperty(positionY);
         this.sizeX = new SimpleDoubleProperty(sizeX);
         this.sizeY = new SimpleDoubleProperty(sizeY);
         this.windowMaximised = new SimpleBooleanProperty(windowMaximised);
         this.lastSelectedIdBasedFetcher = new SimpleStringProperty(lastSelectedIdBasedFetcher);
-        this.sidePaneWidth = new SimpleDoubleProperty(sidePaneWidth);
+        this.horizontalDividerPosition = new SimpleDoubleProperty(horizontalDividerPosition);
+        this.verticalDividerPosition = new SimpleDoubleProperty(verticalDividerPosition);
     }
 
     public double getPositionX() {
@@ -107,15 +110,27 @@ public void setLastSelectedIdBasedFetcher(String lastSelectedIdBasedFetcher) {
         this.lastSelectedIdBasedFetcher.set(lastSelectedIdBasedFetcher);
     }
 
-    public double getSidePaneWidth() {
-        return sidePaneWidth.get();
+    public double getHorizontalDividerPosition() {
+        return horizontalDividerPosition.get();
     }
 
-    public DoubleProperty sidePaneWidthProperty() {
-        return sidePaneWidth;
+    public DoubleProperty horizontalDividerPositionProperty() {
+        return horizontalDividerPosition;
     }
 
-    public void setSidePaneWidth(double sidePaneWidth) {
-        this.sidePaneWidth.set(sidePaneWidth);
+    public void setHorizontalDividerPosition(double horizontalDividerPosition) {
+        this.horizontalDividerPosition.set(horizontalDividerPosition);
+    }
+
+    public double getVerticalDividerPosition() {
+        return verticalDividerPosition.get();
+    }
+
+    public DoubleProperty getVerticalDividerPositionProperty() {
+        return verticalDividerPosition;
+    }
+
+    public void setVerticalDividerPosition(double dividerPosition) {
+        this.verticalDividerPosition.set(dividerPosition);
     }
 }

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

@@ -24,7 +24,7 @@
 import org.jabref.gui.remote.CLIMessageHandler;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.CountingUndoManager;
-import org.jabref.gui.util.DefaultDirectoryMonitor;
+import org.jabref.gui.util.DirectoryMonitor;
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.logic.UiCommand;
 import org.jabref.logic.ai.AiService;
@@ -41,7 +41,6 @@
 import org.jabref.logic.util.WebViewStore;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.model.util.DirectoryMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
 
 import com.airhacks.afterburner.injection.Injector;
@@ -135,7 +134,7 @@ public void start(Stage stage) {
     public void initialize() {
         WebViewStore.init();
 
-        DirectoryMonitor directoryMonitor = new DefaultDirectoryMonitor();
+        DirectoryMonitor directoryMonitor = new DirectoryMonitor();
         Injector.setModelOrService(DirectoryMonitor.class, directoryMonitor);
 
         JabRefGUI.remoteListenerServerManager = new RemoteListenerServerManager();
@@ -265,7 +264,10 @@ private void openWindow() {
     }
 
     public void onShowing(WindowEvent event) {
-        Platform.runLater(() -> mainFrame.updateDividerPosition());
+        Platform.runLater(() -> {
+            mainFrame.updateHorizontalDividerPosition();
+            mainFrame.updateVerticalDividerPosition();
+        });
 
         // Open last edited databases
         if (uiCommands.stream().noneMatch(UiCommand.BlankWorkspace.class::isInstance)