JabRef · tobiasdiez · Mar 5, 2018 · Mar 2, 2018 · Mar 2, 2018 · Mar 2, 2018
diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
@@ -20,6 +20,7 @@
 
 import org.jabref.gui.AbstractView;
 import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.FXDialogService;
 import org.jabref.gui.GUIGlobals;
 import org.jabref.gui.IconTheme;
@@ -51,12 +52,14 @@ public class JabRefGUI {
     private final boolean isBlank;
     private final List<ParserResult> failed = new ArrayList<>();
     private final List<ParserResult> toOpenTab = new ArrayList<>();
+    private final DialogService dialogService;
 
     private final String focusedFile;
 
     public JabRefGUI(Stage mainStage, List<ParserResult> argsDatabases, boolean isBlank) {
         this.bibDatabases = argsDatabases;
         this.isBlank = isBlank;
+        this.dialogService = new FXDialogService(mainStage);
 
         // passed file (we take the first one) should be focused
         focusedFile = argsDatabases.stream().findFirst().flatMap(ParserResult::getFile).map(File::getAbsolutePath)
@@ -87,7 +90,7 @@ private void openWindow(Stage mainStage) {
 
         // If the option is enabled, open the last edited libraries, if any.
         if (!isBlank && Globals.prefs.getBoolean(JabRefPreferences.OPEN_LAST_EDITED)) {
-            openLastEditedDatabases(mainStage);
+            openLastEditedDatabases();
         }
 
         GUIGlobals.init();
@@ -159,12 +162,11 @@ private void openWindow(Stage mainStage) {
         });
 
         for (ParserResult pr : failed) {
-            String message = "<html>" + Localization.lang("Error opening file '%0'.", pr.getFile().get().getName())
-                    + "<p>"
-                    + pr.getErrorMessage() + "</html>";
+            String message = Localization.lang("Error opening file '%0'.", pr.getFile().get().getName()) + "\n"
+                    + pr.getErrorMessage();
+
+            dialogService.showErrorDialogAndWait(Localization.lang("Error opening file"), message);
 
-            JOptionPane.showMessageDialog(null, message, Localization.lang("Error opening file"),
-                    JOptionPane.ERROR_MESSAGE);
         }
 
         // Display warnings, if any
@@ -191,7 +193,7 @@ private void openWindow(Stage mainStage) {
         LOGGER.debug("Finished adding panels");
     }
 
-    private void openLastEditedDatabases(Stage mainStage) {
+    private void openLastEditedDatabases() {
         if (Globals.prefs.get(JabRefPreferences.LAST_EDITED) == null) {
             return;
         }
@@ -206,7 +208,7 @@ private void openLastEditedDatabases(Stage mainStage) {
             }
 
             if (BackupManager.checkForBackupFile(dbFile.toPath())) {
-                BackupUIManager.showRestoreBackupDialog(new FXDialogService(mainStage), dbFile.toPath());
+                BackupUIManager.showRestoreBackupDialog(dialogService, dbFile.toPath());
             }
 
             ParserResult parsedDatabase = OpenDatabase.loadDatabase(fileName,
@@ -264,11 +266,11 @@ private void setLookAndFeel() {
                     // also set system l&f as default
                     Globals.prefs.put(JabRefPreferences.WIN_LOOK_AND_FEEL, systemLookFeel);
                     // notify the user
-                    JOptionPane.showMessageDialog(null,
-                            Localization
-                                    .lang("Unable to find the requested look and feel and thus the default one is used."),
-                            Localization.lang("Warning"), JOptionPane.WARNING_MESSAGE);
+
                     LOGGER.warn("Unable to find requested look and feel", e);
+                    dialogService.showWarningDialogAndWait(Localization.lang("Warning"),
+                            Localization.lang("Unable to find the requested look and feel and thus the default one is used."));
+
                 }
             }
 

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
@@ -525,7 +525,7 @@ public void update() {
 
         actions.put(Actions.OPEN_URL, new OpenURLAction());
 
-        actions.put(Actions.MERGE_WITH_FETCHED_ENTRY, new MergeWithFetchedEntryAction(this));
+        actions.put(Actions.MERGE_WITH_FETCHED_ENTRY, new MergeWithFetchedEntryAction(this, frame.getDialogService()));
 
         actions.put(Actions.REPLACE_ALL, (BaseAction) () -> {
             final ReplaceStringDialog rsd = new ReplaceStringDialog(frame);
@@ -657,7 +657,7 @@ public void update() {
         actions.put(Actions.REMOVE_FROM_GROUP, new GroupAddRemoveDialog(this, false, false));
         actions.put(Actions.MOVE_TO_GROUP, new GroupAddRemoveDialog(this, true, true));
 
-        actions.put(Actions.DOWNLOAD_FULL_TEXT, new FindFullTextAction(this));
+        actions.put(Actions.DOWNLOAD_FULL_TEXT, new FindFullTextAction(frame.getDialogService(), this));
     }
 
     /**

diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
@@ -1,6 +1,7 @@
 package org.jabref.gui;
 
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -9,7 +10,9 @@
 import javafx.print.PrinterJob;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
+import javafx.scene.control.ChoiceDialog;
 import javafx.scene.control.DialogPane;
+import javafx.scene.control.TextInputDialog;
 
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -22,6 +25,14 @@
  */
 public interface DialogService {
 
+    /**
+     * This will create and display new {@link ChoiceDialog} of type T with a default choice and a collection of possible choices
+    */
+    <T> Optional<T> showChoiceDialogAndWait(String title, String content, T defaultChoice, Collection<T> choices);
+
+    /**
+     * This will create and display new {@link TextInputDialog} with a text fields to enter data
+     */
     Optional<String> showInputDialogAndWait(String title, String content);
 
     /**
@@ -224,4 +235,6 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      * @return false if the user opts to cancel printing
      */
     boolean showPrintDialog(PrinterJob job);
+
+
 }
diff --git a/src/main/java/org/jabref/gui/EntryTypeDialog.java b/src/main/java/org/jabref/gui/EntryTypeDialog.java
@@ -20,7 +20,6 @@
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
@@ -331,13 +330,13 @@ protected void done() {
 
                     dispose();
                 } else if (searchID.trim().isEmpty()) {
-                    JOptionPane.showMessageDialog(null, Localization.lang("The given search ID was empty."), Localization.lang("Empty search ID"), JOptionPane.WARNING_MESSAGE);
+                    frame.getDialogService().showWarningDialogAndWait(Localization.lang("Empty search ID"),
+                            Localization.lang("The given search ID was empty."));
                 } else if (!fetcherException) {
-                    JOptionPane.showMessageDialog(null, Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher.getName(), searchID) + "\n" + fetcherExceptionMessage, Localization.lang("No files found."), JOptionPane.WARNING_MESSAGE);
+                    frame.getDialogService().showErrorDialogAndWait(Localization.lang("No files found.",
+                            Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher.getName(), searchID) + "\n" + fetcherExceptionMessage));
                 } else {
-                    JOptionPane.showMessageDialog(null,
-                            Localization.lang("Error while fetching from %0", fetcher.getName()) + "." + "\n" + fetcherExceptionMessage,
-                            Localization.lang("Error"), JOptionPane.ERROR_MESSAGE);
+                    frame.getDialogService().showErrorDialogAndWait(Localization.lang("Error"), Localization.lang("Error while fetching from %0", fetcher.getName()) + "." + "\n" + fetcherExceptionMessage);
                 }
                 fetcherWorker = new FetcherWorker();
                 SwingUtilities.invokeLater(() -> {

diff --git a/src/main/java/org/jabref/gui/FXDialogService.java b/src/main/java/org/jabref/gui/FXDialogService.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -17,6 +18,7 @@
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
+import javafx.scene.control.ChoiceDialog;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.TextInputDialog;
 import javafx.scene.layout.Region;
@@ -97,6 +99,16 @@ protected Node createDetailsButton() {
         return alert;
     }
 
+    @Override
+    public <T> Optional<T> showChoiceDialogAndWait(String title, String content, T defaultChoice, Collection<T> choices)
+    {
+        ChoiceDialog<T> choiceDialog = new ChoiceDialog<>(defaultChoice, choices);
+        choiceDialog.setHeaderText(title);
+        choiceDialog.setContentText(content);
+        return choiceDialog.showAndWait();
+
+    }
+
     @Override
     public Optional<String> showInputDialogAndWait(String title, String content) {
         TextInputDialog inputDialog = new TextInputDialog();
@@ -105,6 +117,7 @@ public Optional<String> showInputDialogAndWait(String title, String content) {
         return inputDialog.showAndWait();
     }
 
+
     @Override
     public void showInformationDialogAndWait(String title, String content) {
         FXDialog alert = createDialog(AlertType.INFORMATION, title, content);

diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java
@@ -5,8 +5,6 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
-import javafx.scene.control.Tooltip;
-
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
 import de.saxsys.mvvmfx.utils.commands.Command;
@@ -17,7 +15,7 @@
  */
 public class ActionFactory {
 
-    private KeyBindingRepository keyBindingRepository;
+    private final KeyBindingRepository keyBindingRepository;
 
     public ActionFactory(KeyBindingRepository keyBindingRepository) {
         this.keyBindingRepository = Objects.requireNonNull(keyBindingRepository);
@@ -59,8 +57,7 @@ public Menu createSubMenu(Action action, MenuItem... children) {
     public Button createIconButton(Action action, Command command) {
         Button button = ActionUtils.createButton(new JabRefAction(action, command, keyBindingRepository), ActionUtils.ActionTextBehavior.HIDE);
         button.getStyleClass().add("flatButton");
-        button.setTooltip(new Tooltip(action.getDescription()));
-
+
         // For some reason the graphic is not set correctly, so let's fix this
         button.graphicProperty().unbind();
         action.getIcon().ifPresent(icon -> button.setGraphic(icon.getGraphicNode()));

diff --git a/src/main/java/org/jabref/gui/actions/JabRefAction.java b/src/main/java/org/jabref/gui/actions/JabRefAction.java
@@ -10,13 +10,16 @@
  */
 class JabRefAction extends org.controlsfx.control.action.Action {
 
+
     public JabRefAction(Action action, KeyBindingRepository keyBindingRepository) {
         super(action.getText());
         action.getIcon()
               .ifPresent(icon -> setGraphic(icon.getGraphicNode()));
         action.getKeyBinding()
               .ifPresent(keyBinding -> setAccelerator(keyBindingRepository.getKeyCombination(keyBinding)));
+
         setLongText(action.getDescription());
+
     }
 
     public JabRefAction(Action action, Command command, KeyBindingRepository keyBindingRepository) {

diff --git a/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java b/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java
@@ -20,7 +20,6 @@
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
-import javax.swing.JOptionPane;
 import javax.swing.JRadioButton;
 import javax.swing.JTextField;
 import javax.swing.undo.UndoableEdit;
@@ -158,17 +157,19 @@ private void createDialog() {
             // Check that any field name is set
             String fieldText = (String) field.getSelectedItem();
             if ((fieldText == null) || fieldText.trim().isEmpty()) {
-                JOptionPane.showMessageDialog(diag, Localization.lang("You must enter at least one field name"), "",
-                        JOptionPane.ERROR_MESSAGE);
+
+                frame.getDialogService().showErrorDialogAndWait(Localization.lang("You must enter at least one field name"));
+
                 return; // Do not close the dialog.
             }
 
             // Check if the user tries to rename multiple fields:
             if (rename.isSelected()) {
                 String[] fields = getFieldNames(fieldText);
                 if (fields.length > 1) {
-                    JOptionPane.showMessageDialog(diag, Localization.lang("You can only rename one field at a time"),
-                            "", JOptionPane.ERROR_MESSAGE);
+
+                    frame.getDialogService().showErrorDialogAndWait(Localization.lang("You can only rename one field at a time"));
+
                     return; // Do not close the dialog.
                 }
             }
@@ -243,8 +244,8 @@ public void execute() {
         NamedCompound compoundEdit = new NamedCompound(Localization.lang("Set field"));
         if (rename.isSelected()) {
             if (fields.length > 1) {
-                JOptionPane.showMessageDialog(diag, Localization.lang("You can only rename one field at a time"), "",
-                        JOptionPane.ERROR_MESSAGE);
+                frame.getDialogService().showErrorDialogAndWait(Localization.lang("You can only rename one field at a time"));
+
                 return; // Do not close the dialog.
             } else {
                 compoundEdit.addEdit(MassSetFieldAction.massRenameField(entryList, fields[0], textFieldRename.getText(),

diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.tree.DefaultMutableTreeNode;
 
@@ -38,6 +37,7 @@
 import org.slf4j.LoggerFactory;
 
 public class ChangeScanner implements Runnable {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ChangeScanner.class);
 
     private final File file;
@@ -94,17 +94,21 @@ public void displayResult(final DisplayResultCallback fup) {
             });
 
         } else {
-            JOptionPane.showMessageDialog(null, Localization.lang("No actual changes found."),
-                    Localization.lang("External changes"), JOptionPane.INFORMATION_MESSAGE);
+            frame.getDialogService().showInformationDialogAndWait(Localization.lang("External changes"),
+                    Localization.lang("No actual changes found."));
+
             fup.scanResultsResolved(true);
         }
     }
 
     private void storeTempDatabase() {
         JabRefExecutorService.INSTANCE.execute(() -> {
             try {
-                SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs).withMakeBackup(false)
-                        .withEncoding(panel.getBibDatabaseContext().getMetaData().getEncoding()
+                SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs)
+                        .withMakeBackup(false)
+                        .withEncoding(panel.getBibDatabaseContext()
+                                .getMetaData()
+                                .getEncoding()
                                 .orElse(Globals.prefs.getDefaultEncoding()));
 
                 BibDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new);
@@ -176,6 +180,7 @@ private ChangeViewModel createBibEntryDiff(BibEntryDiff diff) {
 
     @FunctionalInterface
     public interface DisplayResultCallback {
+
         void scanResultsResolved(boolean resolved);
     }
 }
diff --git a/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java b/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java
@@ -26,7 +26,6 @@
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.ListDataEvent;
@@ -101,7 +100,7 @@ private void initGui() {
         List<String> entryTypes = new ArrayList<>();
         entryTypes.addAll(EntryTypes.getAllTypes(bibDatabaseMode));
 
-        typeComp = new EntryTypeList(entryTypes, bibDatabaseMode);
+        typeComp = new EntryTypeList(frame.getDialogService(), entryTypes, bibDatabaseMode);
         typeComp.addListSelectionListener(this);
         typeComp.addAdditionActionListener(e -> typeComp.selectField(e.getActionCommand()));
         typeComp.addDefaultActionListener(new DefaultListener());
@@ -323,14 +322,14 @@ private void deleteType(String name) {
 
         if (type.isPresent() && (type.get() instanceof CustomEntryType)) {
             if (!EntryTypes.getStandardType(name, bibDatabaseMode).isPresent()) {
-                int reply = JOptionPane.showConfirmDialog
-                        (null, Localization.lang("All entries of this "
-                                        + "type will be declared "
-                                        + "typeless. Continue?"),
-                                Localization.lang("Delete custom format") +
-                                        " '" + StringUtil.capitalizeFirst(name) + '\'', JOptionPane.YES_NO_OPTION,
-                                JOptionPane.WARNING_MESSAGE);
-                if (reply != JOptionPane.YES_OPTION) {
+
+                boolean deleteCustomClicked = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Delete custom format") +
+                        " '" + StringUtil.capitalizeFirst(name) + '\'',  Localization.lang("All entries of this "
+                        + "type will be declared "
+                        + "typeless. Continue?"),
+                        Localization.lang("Delete custom format"), Localization.lang("Cancel"));
+
+                if (!deleteCustomClicked) {
                     return;
                 }
             }