Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 11 commits into from
May 21, 2019
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eb8f81f
Added handover dialogservice
calixtus May 19, 2019
c79ce54
Undone previous
calixtus May 19, 2019
34bef06
Refactor Constructors, handing over dialogService
calixtus May 19, 2019
a363f5c
Reword Identifier
calixtus May 20, 2019
12c14ab
Reformat for codestyle
calixtus May 20, 2019
37b5a68
Merge remote-tracking branch 'upstream/master' into fix-prefs-extp-se…
calixtus May 20, 2019
c456701
Refactor Constructors
calixtus May 20, 2019
f8dcd0c
Delete superfluous import for checkstyle
calixtus May 20, 2019
d689d44
Reformat whitespace
calixtus May 20, 2019
be06f58
Refactor Constructors
calixtus May 21, 2019
ee82c45
Refactor Cleanup
calixtus May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public class PushToApplicationSettings {
protected AbstractPushToApplication application;
private DialogService dialogService;

public GridPane getJFXSettingPane(int n) {
public GridPane getJFXSettingPane(int n, DialogService ds) {
calixtus marked this conversation as resolved.
Show resolved Hide resolved
dialogService = ds;
switch (n) {
case 0:
application = new PushToEmacs(dialogService);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class PushToApplicationSettingsDialog {
public static void showSettingsDialog(DialogService dialogService, PushToApplicationSettings toApp, int n) {

DialogPane dialogPane = new DialogPane();
dialogPane.setContent(toApp.getJFXSettingPane(n));
dialogPane.setContent(toApp.getJFXSettingPane(n, dialogService));

dialogService.showCustomDialogAndWait(Localization.lang("App settings"), dialogPane, ButtonType.OK, ButtonType.CANCEL).ifPresent(btn -> {
if (btn == ButtonType.OK) {
Expand Down