NPE-fix for Preferences/Ext-Prog/Settings for X/Browse

src/main/java/org/jabref/gui/push/AbstractPushToApplication.java

@@ -34,6 +34,10 @@ public AbstractPushToApplication(DialogService dialogService) {
         this.dialogService = dialogService;
     }
 
+    public DialogService getDialogService() {
+        return this.dialogService;
+    }
+
     @Override
     public String getName() {
         return Localization.lang("Push entries to external application (%0)", getApplicationName());

src/main/java/org/jabref/gui/push/PushToApplication.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -19,6 +20,7 @@ public interface PushToApplication {
 
     JabRefIcon getIcon();
 
+    DialogService getDialogService();
 
     /**
      * The actual operation. This method will not be called on the event dispatch thread, so it should not do GUI

src/main/java/org/jabref/gui/push/PushToApplicationSettings.java

@@ -19,6 +19,10 @@ public class PushToApplicationSettings {
     protected AbstractPushToApplication application;
     private DialogService dialogService;
 
+    public PushToApplicationSettings(DialogService dialogService) {
+        this.dialogService = dialogService;
+    }
+
     public GridPane getJFXSettingPane(int n) {
         switch (n) {
             case 0:

src/main/java/org/jabref/gui/push/PushToApplicationsManager.java

@@ -27,13 +27,13 @@ public List<PushToApplication> getApplications() {
 
     public static PushToApplicationSettings getSettings(PushToApplication application) {
         if (application instanceof PushToEmacs) {
-            return new PushToEmacsSettings();
+            return new PushToEmacsSettings(application.getDialogService());
         } else if (application instanceof PushToLyx) {
-            return new PushToLyxSettings();
+            return new PushToLyxSettings(application.getDialogService());
         } else if (application instanceof PushToVim) {
-            return new PushToVimSettings();
+            return new PushToVimSettings(application.getDialogService());
         } else {
-            return new PushToApplicationSettings();
+            return new PushToApplicationSettings(application.getDialogService());
         }
     }
 

src/main/java/org/jabref/gui/push/PushToEmacsSettings.java

@@ -4,13 +4,16 @@
 import javafx.scene.control.TextField;
 
 import org.jabref.Globals;
+import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
 public class PushToEmacsSettings extends PushToApplicationSettings {
 
     private final TextField additionalParams = new TextField();
 
+    public PushToEmacsSettings (DialogService dialogService) { super(dialogService); }
+
     @Override
     public void storeSettings() {
         super.storeSettings();

src/main/java/org/jabref/gui/push/PushToLyxSettings.java

@@ -1,11 +1,14 @@
 package org.jabref.gui.push;
 
 import org.jabref.Globals;
+import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
 public class PushToLyxSettings extends PushToApplicationSettings {
 
+    public PushToLyxSettings (DialogService dialogService) { super(dialogService); }
+
     @Override
     protected void initJFXSettingsPanel() {
         super.initJFXSettingsPanel();

src/main/java/org/jabref/gui/push/PushToVimSettings.java

@@ -4,13 +4,16 @@
 import javafx.scene.control.TextField;
 
 import org.jabref.Globals;
+import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
 public class PushToVimSettings extends PushToApplicationSettings {
 
     private final TextField vimServer = new TextField();
 
+    public PushToVimSettings (DialogService dialogService) { super(dialogService); }
+
     @Override
     public void storeSettings() {
         super.storeSettings();