Fix: Refactor PushToApplications and split into logic and GUI

jabgui/src/main/java/org/jabref/gui/desktop/os/Linux.java

@@ -17,10 +17,10 @@
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
-import org.jabref.gui.util.StreamGobbler;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.Directories;
 import org.jabref.logic.util.HeadlessExecutorService;
+import org.jabref.logic.util.StreamGobbler;
 
 import org.slf4j.LoggerFactory;
 

jabgui/src/main/java/org/jabref/gui/edit/CopyMoreAction.java

@@ -169,13 +169,13 @@ private void doCopyKey(Function<List<String>, String> mapKeyList) {
 
     private void copyCiteKey() {
         doCopyKey(keys -> {
-            CitationCommandString citeCommand = preferences.getExternalApplicationsPreferences().getCiteCommand();
+            CitationCommandString citeCommand = preferences.getPushToApplicationPreferences().getCiteCommand();
             return citeCommand.prefix() + String.join(citeCommand.delimiter(), keys) + citeCommand.suffix();
         });
     }
 
     private void copyKey() {
-        doCopyKey(keys -> String.join(preferences.getExternalApplicationsPreferences().getCiteCommand().delimiter(), keys));
+        doCopyKey(keys -> String.join(preferences.getPushToApplicationPreferences().getCiteCommand().delimiter(), keys));
     }
 
     private void copyKeyAndTitle() {

jabgui/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java

@@ -22,9 +22,9 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.preferences.GuiPreferences;
-import org.jabref.gui.push.PushToApplication;
-import org.jabref.gui.push.PushToApplications;
-import org.jabref.gui.push.PushToTeXstudio;
+import org.jabref.gui.push.GuiPushToApplication;
+import org.jabref.gui.push.GuiPushToApplications;
+import org.jabref.gui.push.GuiPushToTeXstudio;
 import org.jabref.gui.texparser.CitationsDisplay;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.DirectoryMonitor;
@@ -98,11 +98,11 @@ public void handleMouseClick(MouseEvent event, CitationsDisplay citationsDisplay
         if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2 && selectedItem != null) {
             String applicationName = preferences.getPushToApplicationPreferences()
                                                 .getActiveApplicationName();
-            PushToApplication application = PushToApplications.getApplicationByName(
+            GuiPushToApplication application = GuiPushToApplications.getGUIApplicationByName(
                                                                       applicationName,
                                                                       dialogService,
-                                                                      preferences)
-                                                              .orElse(new PushToTeXstudio(dialogService, preferences));
+                                                                      preferences.getPushToApplicationPreferences())
+                                                                    .orElseGet(() -> new GuiPushToTeXstudio(dialogService, preferences.getPushToApplicationPreferences()));
             preferences.getPushToApplicationPreferences().setActiveApplicationName(application.getDisplayName());
             application.jumpToLine(selectedItem.path(), selectedItem.line(), selectedItem.colStart());
         }

jabgui/src/main/java/org/jabref/gui/frame/ExternalApplicationsPreferences.java

@@ -5,24 +5,18 @@
 import java.util.TreeSet;
 
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 
 import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.logic.push.CitationCommandString;
 
 public class ExternalApplicationsPreferences {
 
     private final StringProperty eMailSubject;
     private final BooleanProperty shouldAutoOpenEmailAttachmentsFolder;
-    private final ObjectProperty<CitationCommandString> citeCommand;
-
-    private final ObjectProperty<CitationCommandString> defaultCiteCommand;
 
     private final BooleanProperty useCustomTerminal;
     private final StringProperty customTerminalCommand;
@@ -33,8 +27,6 @@ public class ExternalApplicationsPreferences {
 
     public ExternalApplicationsPreferences(String eMailSubject,
                                            boolean shouldAutoOpenEmailAttachmentsFolder,
-                                           CitationCommandString citeCommand,
-                                           CitationCommandString defaultCiteCommand,
                                            Set<ExternalFileType> externalFileTypes,
                                            boolean useCustomTerminal,
                                            String customTerminalCommand,
@@ -44,8 +36,6 @@ public ExternalApplicationsPreferences(String eMailSubject,
 
         this.eMailSubject = new SimpleStringProperty(eMailSubject);
         this.shouldAutoOpenEmailAttachmentsFolder = new SimpleBooleanProperty(shouldAutoOpenEmailAttachmentsFolder);
-        this.citeCommand = new SimpleObjectProperty<>(citeCommand);
-        this.defaultCiteCommand = new SimpleObjectProperty<>(defaultCiteCommand);
         this.externalFileTypes.addAll(externalFileTypes);
         this.useCustomTerminal = new SimpleBooleanProperty(useCustomTerminal);
         this.customTerminalCommand = new SimpleStringProperty(customTerminalCommand);
@@ -78,18 +68,6 @@ public void setAutoOpenEmailAttachmentsFolder(boolean shouldAutoOpenEmailAttachm
         this.shouldAutoOpenEmailAttachmentsFolder.set(shouldAutoOpenEmailAttachmentsFolder);
     }
 
-    public CitationCommandString getCiteCommand() {
-        return citeCommand.get();
-    }
-
-    public ObjectProperty<CitationCommandString> citeCommandProperty() {
-        return citeCommand;
-    }
-
-    public void setCiteCommand(CitationCommandString citeCommand) {
-        this.citeCommand.set(citeCommand);
-    }
-
     public boolean useCustomTerminal() {
         return useCustomTerminal.get();
     }
@@ -150,10 +128,6 @@ public void setKindleEmail(String kindleEmail) {
         this.kindleEmail.set(kindleEmail);
     }
 
-    public CitationCommandString getDefaultCiteCommand() {
-        return defaultCiteCommand.getValue();
-    }
-
     public ObservableSet<ExternalFileType> getExternalFileTypes() {
         return this.externalFileTypes;
     }

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

@@ -44,7 +44,7 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.libraryproperties.LibraryPropertiesAction;
 import org.jabref.gui.preferences.GuiPreferences;
-import org.jabref.gui.push.PushToApplicationCommand;
+import org.jabref.gui.push.GuiPushToApplicationCommand;
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.search.SearchType;
 import org.jabref.gui.sidepane.SidePane;
@@ -104,7 +104,7 @@ private enum PanelMode { MAIN_TABLE, MAIN_TABLE_AND_ENTRY_EDITOR }
     private final TaskExecutor taskExecutor;
 
     private final JabRefFrameViewModel viewModel;
-    private final PushToApplicationCommand pushToApplicationCommand;
+    private final GuiPushToApplicationCommand pushToApplicationCommand;
     private final SplitPane horizontalSplit = new SplitPane();
     private final SidePane sidePane;
     private final SplitPane verticalSplit = new SplitPane();
@@ -188,7 +188,7 @@ public JabRefFrame(Stage mainStage,
                 clipBoardManager,
                 undoManager);
 
-        this.pushToApplicationCommand = new PushToApplicationCommand(
+        this.pushToApplicationCommand = new GuiPushToApplicationCommand(
                 stateManager,
                 dialogService,
                 this.preferences,

jabgui/src/main/java/org/jabref/gui/frame/MainMenu.java

@@ -62,7 +62,7 @@
 import org.jabref.gui.preferences.ShowPreferencesAction;
 import org.jabref.gui.preview.CopyCitationAction;
 import org.jabref.gui.preview.PreviewControls;
-import org.jabref.gui.push.PushToApplicationCommand;
+import org.jabref.gui.push.GuiPushToApplicationCommand;
 import org.jabref.gui.search.RebuildFulltextSearchIndexAction;
 import org.jabref.gui.shared.ConnectToSharedDatabaseCommand;
 import org.jabref.gui.shared.PullChangesFromSharedAction;
@@ -98,7 +98,7 @@ public class MainMenu extends MenuBar {
     private final JabRefFrame frame;
     private final FileHistoryMenu fileHistoryMenu;
     private final SidePane sidePane;
-    private final PushToApplicationCommand pushToApplicationCommand;
+    private final GuiPushToApplicationCommand pushToApplicationCommand;
     private final GuiPreferences preferences;
     private final StateManager stateManager;
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -115,7 +115,7 @@ public class MainMenu extends MenuBar {
     public MainMenu(JabRefFrame frame,
                     FileHistoryMenu fileHistoryMenu,
                     SidePane sidePane,
-                    PushToApplicationCommand pushToApplicationCommand,
+                    GuiPushToApplicationCommand pushToApplicationCommand,
                     GuiPreferences preferences,
                     StateManager stateManager,
                     FileUpdateMonitor fileUpdateMonitor,

jabgui/src/main/java/org/jabref/gui/frame/MainToolBar.java

@@ -28,7 +28,7 @@
 import org.jabref.gui.importer.NewEntryAction;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.preferences.GuiPreferences;
-import org.jabref.gui.push.PushToApplicationCommand;
+import org.jabref.gui.push.GuiPushToApplicationCommand;
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.CountingUndoManager;
@@ -47,7 +47,7 @@
 
 public class MainToolBar extends ToolBar {
     private final LibraryTabContainer frame;
-    private final PushToApplicationCommand pushToApplicationCommand;
+    private final GuiPushToApplicationCommand pushToApplicationCommand;
     private final GlobalSearchBar globalSearchBar;
     private final DialogService dialogService;
     private final StateManager stateManager;
@@ -64,7 +64,7 @@ public class MainToolBar extends ToolBar {
     private Subscription taskProgressSubscription;
 
     public MainToolBar(LibraryTabContainer tabContainer,
-                       PushToApplicationCommand pushToApplicationCommand,
+                       GuiPushToApplicationCommand pushToApplicationCommand,
                        GlobalSearchBar globalSearchBar,
                        DialogService dialogService,
                        StateManager stateManager,

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

@@ -16,9 +16,9 @@
 import org.jabref.gui.mergeentries.MergeDialogPreferences;
 import org.jabref.gui.newentry.NewEntryPreferences;
 import org.jabref.gui.preview.PreviewPreferences;
-import org.jabref.gui.push.PushToApplicationPreferences;
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
 import org.jabref.logic.preferences.CliPreferences;
+import org.jabref.logic.push.PushToApplicationPreferences;
 
 public interface GuiPreferences extends CliPreferences {
     CopyToPreferences getCopyToPreferences();