Fix ClipboardManager <-> Prefs ordering

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

@@ -44,7 +44,7 @@ private static Object createDependency(Class<?> clazz) {
         } else if (clazz == ProtectedTermsLoader.class) {
             return Globals.protectedTermsLoader;
         } else if (clazz == ClipBoardManager.class) {
-            return Globals.clipboardManager;
+            return Globals.getClipboardManager();
         } else if (clazz == UndoManager.class) {
             return Globals.undoManager;
         } else if (clazz == BibEntryTypesManager.class) {

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

@@ -73,7 +73,8 @@ public class Globals {
     public static ExporterFactory exportFactory;
     public static CountingUndoManager undoManager = new CountingUndoManager();
     public static BibEntryTypesManager entryTypesManager = new BibEntryTypesManager();
-    public static ClipBoardManager clipboardManager = new ClipBoardManager(prefs);
+
+    private static ClipBoardManager clipBoardManager = null;
 
     // Key binding preferences
     private static KeyBindingRepository keyBindingRepository;
@@ -92,6 +93,13 @@ public static synchronized KeyBindingRepository getKeyPrefs() {
         return keyBindingRepository;
     }
 
+    public static synchronized ClipBoardManager getClipboardManager() {
+        if (clipBoardManager == null) {
+            clipBoardManager = new ClipBoardManager(prefs);
+        }
+        return clipBoardManager;
+    }
+
     // Background tasks
     public static void startBackgroundTasks() {
         Globals.fileUpdateMonitor = new DefaultFileUpdateMonitor();

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

@@ -716,13 +716,13 @@ private MenuBar createMenu() {
 
                 factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, this, stateManager)),
                 factory.createSubMenu(StandardActions.COPY_MORE,
-                        factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, Globals.clipboardManager, prefs.getPreviewPreferences())),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(this, dialogService, Globals.exportFactory, Globals.clipboardManager, Globals.TASK_EXECUTOR))),
+                        factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, Globals.getClipboardManager(), prefs.getPreviewPreferences())),
+                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(this, dialogService, Globals.exportFactory, Globals.getClipboardManager(), Globals.TASK_EXECUTOR))),
 
                 factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, this, stateManager)),
 

src/main/java/org/jabref/gui/desktop/JabRefDesktop.java

@@ -212,7 +212,7 @@ public static void openBrowserShowPopup(String url) {
         try {
             openBrowser(url);
         } catch (IOException exception) {
-            Globals.clipboardManager.setContent(url);
+            Globals.getClipboardManager().setContent(url);
             LOGGER.error("Could not open browser", exception);
             String couldNotOpenBrowser = Localization.lang("Could not open browser.");
             String openManually = Localization.lang("Please open %0 manually.", url);

src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java

@@ -27,7 +27,7 @@ public void execute() {
 
         Optional<String> urlOptional = DOI.parse(identifier).map(DOI::getURIAsASCIIString);
         if (urlOptional.isPresent()) {
-            Globals.clipboardManager.setContent(urlOptional.get());
+            Globals.getClipboardManager().setContent(urlOptional.get());
             JabRefGUI.getMainFrame().getDialogService().notify(Localization.lang("The link has been copied to the clipboard."));
         } else {
             JabRefGUI.getMainFrame().getDialogService().notify(Localization.lang("Invalid DOI: '%0'.", identifier));

src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java

@@ -123,7 +123,7 @@ public void copyCurrentAnnotation() {
         sj.add(Localization.lang("Content") + ": " + getCurrentAnnotation().getContent());
         sj.add(Localization.lang("Marking") + ": " + getCurrentAnnotation().markingProperty().get());
 
-        Globals.clipboardManager.setContent(sj.toString());
+        Globals.getClipboardManager().setContent(sj.toString());
     }
 
     private FileAnnotationViewModel getCurrentAnnotation() {

src/main/java/org/jabref/gui/maintable/MainTable.java

@@ -115,7 +115,7 @@ public MainTable(MainTableDataModel model,
                         stateManager,
                         preferencesService,
                         undoManager,
-                        Globals.clipboardManager))
+                        Globals.getClipboardManager()))
                 .setOnDragDetected(this::handleOnDragDetected)
                 .setOnDragDropped(this::handleOnDragDropped)
                 .setOnDragOver(this::handleOnDragOver)
@@ -224,7 +224,7 @@ public void copy() {
 
         if (!selectedEntries.isEmpty()) {
             try {
-                Globals.clipboardManager.setContent(selectedEntries);
+                Globals.getClipboardManager().setContent(selectedEntries);
                 dialogService.notify(libraryTab.formatOutputMessage(Localization.lang("Copied"), selectedEntries.size()));
             } catch (IOException e) {
                 LOGGER.error("Error while copying selected entries to clipboard", e);
@@ -293,7 +293,7 @@ private void clearAndSelectLast() {
 
     public void paste(BibDatabaseMode bibDatabaseMode) {
         // Find entries in clipboard
-        List<BibEntry> entriesToAdd = Globals.clipboardManager.extractData();
+        List<BibEntry> entriesToAdd = Globals.getClipboardManager().extractData();
         ImportCleanup cleanup = new ImportCleanup(bibDatabaseMode);
         cleanup.doPostCleanup(entriesToAdd);
         libraryTab.insertEntries(entriesToAdd);

src/main/java/org/jabref/gui/preview/PreviewViewer.java

@@ -104,7 +104,7 @@ public class PreviewViewer extends ScrollPane implements InvalidationListener {
     public PreviewViewer(BibDatabaseContext database, DialogService dialogService, StateManager stateManager) {
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
-        this.clipBoardManager = Globals.clipboardManager;
+        this.clipBoardManager = Globals.getClipboardManager();
 
         setFitToHeight(true);
         setFitToWidth(true);