Merge branch 'JabRef:main' into fixes-for-issue-11829

Author: anuv-bit

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("org.jabref.gradle.base.repositories")
     id("org.jabref.gradle.feature.compile") // for openrewrite
-    id("org.openrewrite.rewrite") version "7.29.1"
+    id("org.openrewrite.rewrite") version "7.30.0"
     id("org.itsallcode.openfasttrace") version "3.1.1"
     id("org.cyclonedx.bom") version "3.2.3"
 }

jabgui/src/main/java/org/jabref/Launcher.java

@@ -76,7 +76,7 @@ static void main(String[] args) {
                 } else if (instanceAction == MultipleInstanceAction.FOCUS) {
                     // Send focus command to running instance
                     RemotePreferences remotePreferences = preferences.getRemotePreferences();
-                    RemoteClient remoteClient = new RemoteClient(remotePreferences.getPort());
+                    RemoteClient remoteClient = new RemoteClient(remotePreferences.getRemoteServerPort());
                     remoteClient.sendFocus();
                     systemExit();
                 }
@@ -171,9 +171,9 @@ private static void systemExit() {
     private static MultipleInstanceAction handleMultipleAppInstances(String[] args, RemotePreferences remotePreferences) {
         LOGGER.trace("Checking for remote handling...");
 
-        if (remotePreferences.useRemoteServer()) {
+        if (remotePreferences.shouldEnableRemoteServer()) {
             // Try to contact already running JabRef
-            RemoteClient remoteClient = new RemoteClient(remotePreferences.getPort());
+            RemoteClient remoteClient = new RemoteClient(remotePreferences.getRemoteServerPort());
             if (remoteClient.ping()) {
                 LOGGER.debug("Pinging other instance succeeded.");
                 if (args.length == 0) {

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

@@ -457,16 +457,16 @@ private boolean upperRightIsInBounds(CoreGuiPreferences coreGuiPreferences) {
     public void startBackgroundTasks() {
         RemotePreferences remotePreferences = preferences.getRemotePreferences();
         CLIMessageHandler cliMessageHandler = new CLIMessageHandler(mainFrame, preferences);
-        if (remotePreferences.useRemoteServer()) {
+        if (remotePreferences.shouldEnableRemoteServer()) {
             remoteListenerServerManager.openAndStart(
                     cliMessageHandler,
-                    remotePreferences.getPort());
+                    remotePreferences.getRemoteServerPort());
         }
 
-        if (remotePreferences.enableHttpServer()) {
+        if (remotePreferences.shouldEnableHttpServer()) {
             httpServerManager.start(preferences, stateManager, mainFrame, remotePreferences.getHttpServerUri());
         }
-        if (remotePreferences.enableLanguageServer()) {
+        if (remotePreferences.shouldEnableLanguageServer()) {
             languageServerController.start(cliMessageHandler, remotePreferences.getLanguageServerPort());
         }
     }

jabgui/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java

@@ -537,7 +537,7 @@ private List<BibEntry> handlePdfUrl(String pdfUrl) throws IOException {
     }
 
     private void addToImportEntriesGroup(List<BibEntry> entriesToInsert) {
-        if (preferences.getLibraryPreferences().isAddImportedEntriesEnabled()) {
+        if (preferences.getLibraryPreferences().shouldAddImportedEntries()) {
             String groupName = preferences.getLibraryPreferences().getAddImportedEntriesGroupName();
             // We cannot add the new group here directly because we don't have access to the group node ViewModel stuff here
             // We would need to add the groups to the metadata first which is a bit more complicated, thus we decided against it atm

jabgui/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java

@@ -189,7 +189,7 @@ private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
     /// Creates the "Imported entries" group if enabled and missing.
     /// Selection is disabled to prevent focus theft when switching tabs.
     private void addGroupImportEntries(GroupNodeViewModel parent) {
-        if (!preferences.getLibraryPreferences().isAddImportedEntriesEnabled()) {
+        if (!preferences.getLibraryPreferences().shouldAddImportedEntries()) {
             return;
         }
 

jabgui/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java

@@ -69,7 +69,7 @@ public void execute() {
 
             if (link.isPresent()) {
                 try {
-                    if (field.equals(StandardField.DOI) && preferences.getDOIPreferences().isUseCustom()) {
+                    if (field.equals(StandardField.DOI) && preferences.getDOIPreferences().shouldUseCustom()) {
                         NativeDesktop.openCustomDoi(link.get(), preferences, dialogService);
                     } else {
                         NativeDesktop.openExternalViewer(databaseContext, preferences, link.get(), field, dialogService, entry);

jabgui/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java

@@ -57,9 +57,9 @@ public void setValues() {
         resolvableTagsFieldProperty.setValue(FXCollections.observableArrayList(fieldPreferences.getResolvableFields()));
         nonWrappableTagsFieldProperty.setValue(FXCollections.observableArrayList(fieldPreferences.getNonWrappableFields()));
 
-        markOwnerProperty.setValue(ownerPreferences.isUseOwner());
+        markOwnerProperty.setValue(ownerPreferences.shouldUseOwner());
         markOwnerNameProperty.setValue(ownerPreferences.getDefaultOwner());
-        markOwnerOverwriteProperty.setValue(ownerPreferences.isOverwriteOwner());
+        markOwnerOverwriteProperty.setValue(ownerPreferences.shouldOverwriteOwner());
 
         addCreationDateProperty.setValue(timestampPreferences.shouldAddCreationDate());
         addModificationDateProperty.setValue(timestampPreferences.shouldAddModificationDate());

jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java

@@ -228,13 +228,13 @@ public void setValues() {
         createBackupProperty.setValue(filePreferences.shouldCreateBackup());
         backupDirectoryProperty.setValue(filePreferences.getBackupDirectory().toString());
 
-        remoteServerProperty.setValue(remotePreferences.useRemoteServer());
-        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
+        remoteServerProperty.setValue(remotePreferences.shouldEnableRemoteServer());
+        remotePortProperty.setValue(String.valueOf(remotePreferences.getRemoteServerPort()));
 
-        enableHttpServerProperty.setValue(remotePreferences.enableHttpServer());
-        httpPortProperty.setValue(String.valueOf(remotePreferences.getHttpPort()));
+        enableHttpServerProperty.setValue(remotePreferences.shouldEnableHttpServer());
+        httpPortProperty.setValue(String.valueOf(remotePreferences.getHttpServerPort()));
 
-        enableLanguageServerProperty.setValue(remotePreferences.enableLanguageServer());
+        enableLanguageServerProperty.setValue(remotePreferences.shouldEnableLanguageServer());
         languageServerPortProperty.setValue(String.valueOf(remotePreferences.getLanguageServerPort()));
     }
 
@@ -277,31 +277,25 @@ public void storeSettings() {
         filePreferences.backupDirectoryProperty().setValue(Path.of(backupDirectoryProperty.getValue()));
 
         getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
-            if (remotePreferences.isDifferentPort(newPort)) {
-                remotePreferences.setPort(newPort);
-            }
-        });
-
-        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
-            if (remotePreferences.isDifferentPort(newPort)) {
-                remotePreferences.setPort(newPort);
+            if (remotePreferences.isDifferentRemoteServerPort(newPort)) {
+                remotePreferences.setRemoteServerPort(newPort);
             }
         });
 
         CLIMessageHandler messageHandler = new CLIMessageHandler(uiMessageHandler, preferences);
         // stop in all cases, because the port might have changed
         remoteListenerServerManager.stop();
         if (remoteServerProperty.getValue()) {
-            remotePreferences.setUseRemoteServer(true);
-            remoteListenerServerManager.openAndStart(messageHandler, remotePreferences.getPort());
+            remotePreferences.setEnableRemoteServer(true);
+            remoteListenerServerManager.openAndStart(messageHandler, remotePreferences.getRemoteServerPort());
         } else {
-            remotePreferences.setUseRemoteServer(false);
+            remotePreferences.setEnableRemoteServer(false);
             remoteListenerServerManager.stop();
         }
 
         getPortAsInt(httpPortProperty.getValue()).ifPresent(newPort -> {
-            if (remotePreferences.isDifferentHttpPort(newPort)) {
-                remotePreferences.setHttpPort(newPort);
+            if (remotePreferences.isDifferentHttpServerPort(newPort)) {
+                remotePreferences.setHttpServerPort(newPort);
             }
         });
 

jabgui/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java

@@ -148,12 +148,12 @@ public void setValues() {
         warnAboutDuplicatesOnImportProperty.setValue(importerPreferences.shouldWarnAboutDuplicatesOnImport());
         shouldDownloadLinkedOnlineFiles.setValue(filePreferences.shouldDownloadLinkedFiles());
         shouldKeepDownloadUrl.setValue(filePreferences.shouldKeepDownloadUrl());
-        addImportedEntries.setValue(libraryPreferences.isAddImportedEntriesEnabled());
+        addImportedEntries.setValue(libraryPreferences.shouldAddImportedEntries());
         addImportedEntriesGroupName.setValue(libraryPreferences.getAddImportedEntriesGroupName());
         defaultPlainCitationParser.setValue(importerPreferences.getDefaultPlainCitationParser());
         citationsRelationStoreTTL.setValue(importerPreferences.getCitationsRelationsStoreTTL());
 
-        useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
+        useCustomDOIProperty.setValue(doiPreferences.shouldUseCustom());
         useCustomDOINameProperty.setValue(doiPreferences.getDefaultBaseURI());
 
         grobidEnabledProperty.setValue(grobidPreferences.isGrobidEnabled());

jabgui/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java

@@ -84,7 +84,7 @@ void setUp() {
         when(stateManager.getActiveDatabase()).thenReturn(Optional.of(bibDatabaseContext));
 
         LibraryPreferences libraryPreferences = mock(LibraryPreferences.class);
-        when(libraryPreferences.isAddImportedEntriesEnabled()).thenReturn(false);
+        when(libraryPreferences.shouldAddImportedEntries()).thenReturn(false);
         when(preferences.getLibraryPreferences()).thenReturn(libraryPreferences);
 
         viewModel = new CitationsRelationsTabViewModel(