Refactor Constructors

JabRef · May 20, 2019 · c456701 · c456701
1 parent 37b5a68
commit c456701
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.java b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
@@ -197,7 +197,7 @@ public Node getBuilder() {
  }
 
  private void addSettingsButton(final PushToApplication application, GridPane panel, int index) {
- PushToApplicationSettings settings = PushToApplicationsManager.getSettings(application);
+ PushToApplicationSettings settings = PushToApplicationsManager.getSettings(application, dialogService);
  Button button = new Button(Localization.lang("Settings for %0", application.getApplicationName()));
  button.setPrefSize(150, 20);
  button.setOnAction(e -> PushToApplicationSettingsDialog.showSettingsDialog(dialogService, settings, index));

diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
@@ -34,10 +34,6 @@ 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());

diff --git a/src/main/java/org/jabref/gui/push/PushToApplication.java b/src/main/java/org/jabref/gui/push/PushToApplication.java
@@ -20,8 +20,6 @@ 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
  * operations without utilizing invokeLater().

diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationsManager.java b/src/main/java/org/jabref/gui/push/PushToApplicationsManager.java
@@ -25,15 +25,15 @@ public List<PushToApplication> getApplications() {
  return applications;
  }
 
- public static PushToApplicationSettings getSettings(PushToApplication application) {
+ public static PushToApplicationSettings getSettings(PushToApplication application, DialogService dialogService) {
  if (application instanceof PushToEmacs) {
- return new PushToEmacsSettings(application.getDialogService());
+ return new PushToEmacsSettings(dialogService);
  } else if (application instanceof PushToLyx) {
- return new PushToLyxSettings(application.getDialogService());
+ return new PushToLyxSettings(dialogService);
  } else if (application instanceof PushToVim) {
- return new PushToVimSettings(application.getDialogService());
+ return new PushToVimSettings(dialogService);
  } else {
- return new PushToApplicationSettings(application.getDialogService());
+ return new PushToApplicationSettings(dialogService);
  }
  }