Fix PushToPreferences reset and import (#15395)

* Initial cleanups

* Adapt PushToApplicationPreferences

* Fix artifact

* Cleanup in WorkspacePreferences

* Fix import

* Fix and simplify Map of command paths

* Fix duplicate VSCode application

* Stylistic changes

* Fix empty strings in prefs

* Fix resetting of application settings

* Fix checkstyle

---------

Co-authored-by: Carl Christian Snethlage <calixtus@users.noreply.github.com>

Author: calixtus

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

@@ -19,7 +19,6 @@ public class WorkspacePreferences {
     private final ObjectProperty<Language> language;
     private final BooleanProperty shouldOverrideDefaultFontSize;
     private final IntegerProperty mainFontSize;
-    private final IntegerProperty defaultFontSize;
     private final ObjectProperty<Theme> theme;
     private final BooleanProperty themeSyncOs;
     private final BooleanProperty shouldOpenLastEdited;
@@ -31,7 +30,6 @@ public class WorkspacePreferences {
     public WorkspacePreferences(Language language,
                                 boolean shouldOverrideDefaultFontSize,
                                 int mainFontSize,
-                                int defaultFontSize,
                                 Theme theme,
                                 boolean themeSyncOs,
                                 boolean shouldOpenLastEdited,
@@ -42,7 +40,6 @@ public WorkspacePreferences(Language language,
         this.language = new SimpleObjectProperty<>(language);
         this.shouldOverrideDefaultFontSize = new SimpleBooleanProperty(shouldOverrideDefaultFontSize);
         this.mainFontSize = new SimpleIntegerProperty(mainFontSize);
-        this.defaultFontSize = new SimpleIntegerProperty(defaultFontSize);
         this.theme = new SimpleObjectProperty<>(theme);
         this.themeSyncOs = new SimpleBooleanProperty(themeSyncOs);
         this.shouldOpenLastEdited = new SimpleBooleanProperty(shouldOpenLastEdited);
@@ -58,7 +55,6 @@ private WorkspacePreferences() {
                 Language.getLanguageFor(Locale.getDefault().getLanguage()), // Default language
                 false,                                                      // Default font size override
                 9,                                                          // Default font size
-                9,                                                          // FixMe: main default and default default is weird
                 new Theme(Theme.BASE_CSS),                                  // Default theme
                 false,                                                      // Default theme sync with OS
                 true,                                                       // Default open last edited
@@ -77,7 +73,6 @@ public void setAll(WorkspacePreferences preferences) {
         this.language.set(preferences.getLanguage());
         this.shouldOverrideDefaultFontSize.set(preferences.shouldOverrideDefaultFontSize());
         this.mainFontSize.set(preferences.getMainFontSize());
-        this.defaultFontSize.set(preferences.getDefaultFontSize());
         this.theme.set(preferences.getTheme());
         this.themeSyncOs.set(preferences.shouldThemeSyncOs());
         this.shouldOpenLastEdited.set(preferences.shouldOpenLastEdited());
@@ -115,10 +110,6 @@ public int getMainFontSize() {
         return mainFontSize.get();
     }
 
-    public int getDefaultFontSize() {
-        return defaultFontSize.get();
-    }
-
     public void setMainFontSize(int mainFontSize) {
         this.mainFontSize.set(mainFontSize);
     }

jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java

@@ -583,7 +583,6 @@ private WorkspacePreferences getWorkspacePreferencesFromBackingStore(WorkspacePr
                 getLanguage(),
                 getBoolean(OVERRIDE_DEFAULT_FONT_SIZE, defaults.shouldOverrideDefaultFontSize()),
                 getInt(MAIN_FONT_SIZE, defaults.getMainFontSize()),
-                defaults.getDefaultFontSize(), // FixMe
                 new Theme(get(THEME, Theme.BASE_CSS)),
                 getBoolean(THEME_SYNC_OS, defaults.shouldThemeSyncOs()),
                 getBoolean(OPEN_LAST_EDITED, defaults.shouldOpenLastEdited()),

jabgui/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java

@@ -1,7 +1,5 @@
 package org.jabref.gui.preferences.external;
 
-import java.util.HashMap;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -63,16 +61,10 @@ public class ExternalTabViewModel implements PreferenceTabViewModel {
     public ExternalTabViewModel(DialogService dialogService, GuiPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        this.initialExternalApplicationPreferences = this.preferences.getExternalApplicationsPreferences();
-        this.initialPushToApplicationPreferences = this.preferences.getPushToApplicationPreferences();
-        this.workingPushToApplicationPreferences = new PushToApplicationPreferences(
-                initialPushToApplicationPreferences.getActiveApplicationName(),
-                new HashMap<>(initialPushToApplicationPreferences.getCommandPaths()),
-                initialPushToApplicationPreferences.getEmacsArguments(),
-                initialPushToApplicationPreferences.getVimServer(),
-                initialPushToApplicationPreferences.getCiteCommand(),
-                initialPushToApplicationPreferences.getDefaultCiteCommand()
-        );
+        this.initialExternalApplicationPreferences = preferences.getExternalApplicationsPreferences();
+        this.initialPushToApplicationPreferences = preferences.getPushToApplicationPreferences();
+        this.workingPushToApplicationPreferences = PushToApplicationPreferences.getDefault();
+        this.workingPushToApplicationPreferences.setAll(initialPushToApplicationPreferences);
 
         terminalCommandValidator = new FunctionBasedValidator<>(
                 customTerminalCommandProperty,
@@ -102,6 +94,8 @@ public ExternalTabViewModel(DialogService dialogService, GuiPreferences preferen
 
     @Override
     public void setValues() {
+        workingPushToApplicationPreferences.setAll(preferences.getPushToApplicationPreferences());
+
         eMailReferenceSubjectProperty.setValue(initialExternalApplicationPreferences.getEmailSubject());
         autoOpenAttachedFoldersProperty.setValue(initialExternalApplicationPreferences.shouldAutoOpenEmailAttachmentsFolder());
 
@@ -176,7 +170,11 @@ public boolean validateSettings() {
 
     public void pushToApplicationSettings() {
         GuiPushToApplication selectedApplication = selectedPushToApplicationProperty.getValue();
-        GuiPushToApplicationSettings settings = selectedApplication.getSettings(selectedApplication, dialogService, preferences.getFilePreferences(), workingPushToApplicationPreferences);
+        GuiPushToApplicationSettings settings = selectedApplication.getSettings(
+                selectedApplication,
+                dialogService,
+                preferences.getFilePreferences(),
+                workingPushToApplicationPreferences);
 
         DialogPane dialogPane = new DialogPane();
         dialogPane.setContent(settings.getSettingsPane());
@@ -250,6 +248,6 @@ public StringProperty customFileBrowserCommandProperty() {
     }
 
     public void resetCiteCommandToDefault() {
-        this.citeCommandProperty.setValue(preferences.getPushToApplicationPreferences().getDefaultCiteCommand().toString());
+        this.citeCommandProperty.setValue(PushToApplicationPreferences.getDefault().getCiteCommand().toString());
     }
 }

jabgui/src/main/java/org/jabref/gui/push/GuiPushToApplication.java

@@ -24,7 +24,10 @@ default Action getAction() {
         return new GuiPushToApplicationAction(getDisplayName(), getApplicationIcon());
     }
 
-    default GuiPushToApplicationSettings getSettings(PushToApplication application, DialogService dialogService, FilePreferences filePreferences, PushToApplicationPreferences pushToApplicationPreferences) {
+    default GuiPushToApplicationSettings getSettings(PushToApplication application,
+                                                     DialogService dialogService,
+                                                     FilePreferences filePreferences,
+                                                     PushToApplicationPreferences pushToApplicationPreferences) {
         return new GuiPushToApplicationSettings(application, dialogService, filePreferences, pushToApplicationPreferences);
     }
 }

jabgui/src/main/java/org/jabref/gui/push/GuiPushToApplicationSettings.java

@@ -1,8 +1,5 @@
 package org.jabref.gui.push;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
@@ -77,12 +74,9 @@ public GuiPushToApplicationSettings(PushToApplication application,
     }
 
     /// This method is called to indicate that the settings panel returned from the getSettingsPanel() method has been
-    /// shown to the user and that the user has indicated that the settings should be stored. This method must store the
-    /// state of the widgets in the settings panel to Globals.prefs.
+    /// shown to the user and that the user has indicated that the settings should be stored.
     public void storeSettings() {
-        Map<String, String> commandPaths = new HashMap<>(preferences.getCommandPaths());
-        commandPaths.put(application.getDisplayName(), path.getText());
-        preferences.setCommandPaths(commandPaths);
+        preferences.getCommandPaths().put(application.getDisplayName(), path.getText());
     }
 
     public GridPane getSettingsPane() {

jabgui/src/main/java/org/jabref/gui/push/GuiPushToApplications.java

@@ -32,8 +32,7 @@ public static List<GuiPushToApplication> getAllGUIApplications(DialogService dia
                 new GuiPushToTeXworks(dialogService, preferences),
                 new GuiPushToVim(dialogService, preferences),
                 new GuiPushToVScode(dialogService, preferences),
-                new GuiPushToWinEdt(dialogService, preferences),
-                new GuiPushToVScode(dialogService, preferences)));
+                new GuiPushToWinEdt(dialogService, preferences)));
 
         APPLICATIONS.sort(Comparator.comparing(PushToApplication::getDisplayName, String.CASE_INSENSITIVE_ORDER));
 

jabgui/src/main/java/org/jabref/gui/theme/ThemeManager.java

@@ -148,8 +148,9 @@ private void updateFontStyle(@NonNull Scene scene) {
             LOGGER.debug("Overriding font size with user preference to {}pt", workspacePreferences.getMainFontSize());
             scene.getRoot().setStyle("-fx-font-size: " + workspacePreferences.getMainFontSize() + "pt;");
         } else {
-            LOGGER.debug("Using default font size of {}pt", workspacePreferences.getDefaultFontSize());
-            scene.getRoot().setStyle("-fx-font-size: " + workspacePreferences.getDefaultFontSize() + "pt;");
+            int mainFontSize = WorkspacePreferences.getDefault().getMainFontSize();
+            LOGGER.debug("Using default font size of {}pt", mainFontSize);
+            scene.getRoot().setStyle("-fx-font-size: " + mainFontSize + "pt;");
         }
     }
 

jabgui/src/main/resources/org/jabref/gui/preferences/external/ExternalTab.fxml

@@ -42,7 +42,7 @@
             </rowConstraints>
             <Label text="%Application to push entries to"/>
             <SearchableComboBox fx:id="pushToApplicationCombo"
-                                prefWidth="200.0" GridPane.columnIndex="1"  editable="false"/>
+                                prefWidth="200.0" GridPane.columnIndex="1"/>
             <Button styleClass="icon-button,narrow" onAction="#pushToApplicationSettings"
                     prefHeight="20.0" prefWidth="20.0" GridPane.columnIndex="2">
                 <graphic>

jablib/src/main/java/org/jabref/logic/preferences/CliPreferences.java

@@ -60,10 +60,6 @@ public interface CliPreferences {
 
     Map<String, Object> getDefaults();
 
-    LayoutFormatterPreferences getLayoutFormatterPreferences();
-
-    ImportFormatPreferences getImportFormatPreferences();
-
     /// Returns the export configuration. The contained SaveConfiguration is a {@link org.jabref.model.metadata.SelfContainedSaveOrder}
     SelfContainedSaveConfiguration getSelfContainedExportConfiguration();
 
@@ -118,4 +114,22 @@ public interface CliPreferences {
     PushToApplicationPreferences getPushToApplicationPreferences();
 
     GitPreferences getGitPreferences();
+
+    default ImportFormatPreferences getImportFormatPreferences() {
+        return new ImportFormatPreferences(
+                getBibEntryPreferences(),
+                getCitationKeyPatternPreferences(),
+                getFieldPreferences(),
+                getXmpPreferences(),
+                getDOIPreferences(),
+                getGrobidPreferences(),
+                getFilePreferences());
+    }
+
+    default LayoutFormatterPreferences getLayoutFormatterPreferences() {
+        return new LayoutFormatterPreferences(
+                getNameFormatterPreferences(),
+                getDOIPreferences(),
+                getFilePreferences().mainFileDirectoryProperty());
+    }
 }