javafx replacement for file dialog

CHANGELOG.md

@@ -43,6 +43,7 @@ The new default removes the linked file from the entry instead of deleting the f
 - We added another CLI functionality for reading and writing metadata to pdfs. (see https://github.com/JabRef/jabref/pull/3756 and see http://help.jabref.org/en/CommandLine)
 - We no longer print errors in field values during autosave into the log [#3811](https://github.com/JabRef/jabref/issues/3811)
 
+
 ### Fixed
 - We fixed several performance problems with the management of journal abbreviations [#3323](https://github.com/JabRef/jabref/issues/3323)
 - We fixed an issue where changing the type of an entry did not update the label in the tool bar of the entry editor and the contents of the currently visible entry editor tab

src/main/java/org/jabref/gui/actions/CopyFilesAction.java

@@ -48,7 +48,7 @@ private void showDialog(List<CopyFilesResultItemViewModel> data) {
             return;
         }
         CopyFilesDialogView dialog = new CopyFilesDialogView(databaseContext, new CopyFilesResultListDependency(data));
-        dialog.show();
+        dialog.showAndWait();
     }
 
     @Override

src/main/java/org/jabref/gui/actions/StandardActions.java

@@ -34,7 +34,7 @@ public enum StandardActions implements Action {
     OPEN_EXTERNAL_FILE(Localization.lang("Open file"), IconTheme.JabRefIcons.FILE, KeyBinding.OPEN_FILE),
     OPEN_URL(Localization.lang("Open URL or DOI"), IconTheme.JabRefIcons.WWW, KeyBinding.OPEN_URL_OR_DOI),
     MERGE_WITH_FETCHED_ENTRY(Localization.lang("Get BibTeX data from %0", "DOI/ISBN/...")),
-    ADD_FILE_LINK(Localization.lang("Attach file"), IconTheme.JabRefIcons.ATTACH_FILE),
+    ATTACH_FILE(Localization.lang("Attach file"), IconTheme.JabRefIcons.ATTACH_FILE),
     ADD_TO_GROUP(Localization.lang("Add to group")),
     REMOVE_FROM_GROUP(Localization.lang("Remove from group")),
     MOVE_TO_GROUP(Localization.lang("Move to group")),

src/main/java/org/jabref/gui/copyfiles/CopyFilesDialog.fxml

@@ -23,13 +23,6 @@
                </columnResizePolicy>
             </TableView>
          </center>
-         <bottom>
-            <ButtonBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-               <buttons>
-                  <Button defaultButton="true" mnemonicParsing="false" onAction="#close" text="%OK" ButtonBar.buttonData="OK_DONE" />
-               </buttons>
-            </ButtonBar>
-         </bottom>
       </BorderPane>
    </content>
 </DialogPane>

src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java

@@ -1,7 +1,7 @@
 package org.jabref.gui.copyfiles;
 
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.paint.Color;
@@ -28,16 +28,13 @@ public CopyFilesDialogView(BibDatabaseContext bibDatabaseContext, CopyFilesResul
         this.setTitle(Localization.lang("Result"));
         this.setResizable(true);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsContent(this.getDialogPane());
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.OK);
 
         viewModel = new CopyFilesDialogViewModel(results);
-    }
 
-    @FXML
-    private void close(@SuppressWarnings("unused") ActionEvent event) {
-        close();
+        ViewLoader.view(this)
+                  .load()
+                  .setAsContent(this.getDialogPane());
     }
 
     @FXML

src/main/java/org/jabref/gui/desktop/JabRefDesktop.java

@@ -5,38 +5,26 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
 import org.jabref.Globals;
 import org.jabref.JabRefGUI;
 import org.jabref.gui.ClipBoardManager;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.desktop.os.DefaultDesktop;
 import org.jabref.gui.desktop.os.Linux;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.desktop.os.OSX;
 import org.jabref.gui.desktop.os.Windows;
 import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypeEntryEditor;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
-import org.jabref.gui.filelist.FileListEntry;
-import org.jabref.gui.filelist.FileListEntryEditor;
-import org.jabref.gui.filelist.FileListTableModel;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.Eprint;
@@ -64,7 +52,8 @@ private JabRefDesktop() {
      * Open a http/pdf/ps viewer for the given link string.
      */
     public static void openExternalViewer(BibDatabaseContext databaseContext, String initialLink,
-            String initialFieldName) throws IOException {
+                                          String initialFieldName)
+        throws IOException {
         String link = initialLink;
         String fieldName = initialFieldName;
         if (FieldName.PS.equals(fieldName) || FieldName.PDF.equals(fieldName)) {
@@ -85,7 +74,7 @@ public static void openExternalViewer(BibDatabaseContext databaseContext, String
                 if ("pdf".equalsIgnoreCase(split[split.length - 1])) {
                     fieldName = FieldName.PDF;
                 } else if ("ps".equalsIgnoreCase(split[split.length - 1])
-                        || ((split.length >= 3) && "ps".equalsIgnoreCase(split[split.length - 2]))) {
+                           || ((split.length >= 3) && "ps".equalsIgnoreCase(split[split.length - 2]))) {
                     fieldName = FieldName.PS;
                 }
             }
@@ -132,7 +121,8 @@ private static void openDoi(String doi) throws IOException {
      * @return false if the link couldn't be resolved, true otherwise.
      */
     public static boolean openExternalFileAnyFormat(final BibDatabaseContext databaseContext, String link,
-            final Optional<ExternalFileType> type) throws IOException {
+                                                    final Optional<ExternalFileType> type)
+        throws IOException {
 
         if (REMOTE_LINK_PATTERN.matcher(link.toLowerCase(Locale.ROOT)).matches()) {
             openExternalFilePlatformIndependent(type, link);
@@ -156,7 +146,7 @@ public static boolean openExternalFileAnyFormat(Path file, final BibDatabaseCont
     }
 
     private static void openExternalFilePlatformIndependent(Optional<ExternalFileType> fileType, String filePath)
-            throws IOException {
+        throws IOException {
         if (fileType.isPresent()) {
             String application = fileType.get().getOpenWithApplication();
 
@@ -168,82 +158,6 @@ private static void openExternalFilePlatformIndependent(Optional<ExternalFileTyp
         }
     }
 
-    public static boolean openExternalFileUnknown(JabRefFrame frame, BibEntry entry, BibDatabaseContext databaseContext,
-            String link, UnknownExternalFileType fileType) throws IOException {
-
-        String cancelMessage = Localization.lang("Unable to open file.");
-        String[] options = new String[] {Localization.lang("Define '%0'", fileType.getName()),
-                Localization.lang("Change file type"), Localization.lang("Cancel")};
-        String defOption = options[0];
-        int answer = JOptionPane.showOptionDialog(null,
-                Localization.lang("This external link is of the type '%0', which is undefined. What do you want to do?",
-                        fileType.getName()),
-                Localization.lang("Undefined file type"), JOptionPane.YES_NO_CANCEL_OPTION,
-                JOptionPane.QUESTION_MESSAGE, null, options, defOption);
-        if (answer == JOptionPane.CANCEL_OPTION) {
-            frame.output(cancelMessage);
-            return false;
-        } else if (answer == JOptionPane.YES_OPTION) {
-            // User wants to define the new file type. Show the dialog:
-
-            ExternalFileType newType = new ExternalFileType(fileType.getName(), "", "", "", "new", IconTheme.JabRefIcons.FILE);
-            ExternalFileTypeEntryEditor editor = new ExternalFileTypeEntryEditor((JFrame) null, newType);
-
-            editor.setVisible(true);
-            if (editor.okPressed()) {
-                // Get the old list of types, add this one, and update the list in prefs:
-                List<ExternalFileType> fileTypes = new ArrayList<>(
-                        ExternalFileTypes.getInstance().getExternalFileTypeSelection());
-                fileTypes.add(newType);
-                Collections.sort(fileTypes);
-                ExternalFileTypes.getInstance().setExternalFileTypes(fileTypes);
-                // Finally, open the file:
-                return openExternalFileAnyFormat(databaseContext, link, Optional.of(newType));
-            } else {
-                // Canceled:
-                frame.output(cancelMessage);
-                return false;
-            }
-        } else {
-            // User wants to change the type of this link.
-            // First get a model of all file links for this entry:
-            FileListTableModel tModel = new FileListTableModel();
-            Optional<String> oldValue = entry.getField(FieldName.FILE);
-            oldValue.ifPresent(tModel::setContent);
-            FileListEntry flEntry = null;
-            // Then find which one we are looking at:
-            for (int i = 0; i < tModel.getRowCount(); i++) {
-                FileListEntry iEntry = tModel.getEntry(i);
-                if (iEntry.getLink().equals(link)) {
-                    flEntry = iEntry;
-                    break;
-                }
-            }
-            if (flEntry == null) {
-                // This shouldn't happen, so I'm not sure what to put in here:
-                throw new RuntimeException("Could not find the file list entry " + link + " in " + entry);
-            }
-
-            FileListEntryEditor editor = new FileListEntryEditor(flEntry.toParsedFileField(), false, true, databaseContext);
-            editor.setVisible(true, false);
-            if (editor.okPressed()) {
-                // Store the changes and add an undo edit:
-                String newValue = tModel.getStringRepresentation();
-                UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE, oldValue.orElse(null),
-                        newValue);
-                entry.setField(FieldName.FILE, newValue);
-                frame.getCurrentBasePanel().getUndoManager().addEdit(ce);
-                frame.getCurrentBasePanel().markBaseChanged();
-                // Finally, open the link:
-                return openExternalFileAnyFormat(databaseContext, flEntry.getLink(), flEntry.getType());
-            } else {
-                // Canceled:
-                frame.output(cancelMessage);
-                return false;
-            }
-        }
-    }
-
     /**
      * Opens a file browser of the folder of the given file. If possible, the file is selected
      * @param fileLink the location of the file
@@ -284,8 +198,11 @@ public static void openBrowserShowPopup(String url) {
             String openManually = Localization.lang("Please open %0 manually.", url);
             String copiedToClipboard = Localization.lang("The link has been copied to the clipboard.");
             JabRefGUI.getMainFrame().output(couldNotOpenBrowser);
-            JOptionPane.showMessageDialog(null, couldNotOpenBrowser + "\n" + openManually + "\n" +
-                    copiedToClipboard, couldNotOpenBrowser, JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null,
+                                          couldNotOpenBrowser + "\n" + openManually + "\n" +
+                                                copiedToClipboard,
+                                          couldNotOpenBrowser,
+                                          JOptionPane.ERROR_MESSAGE);
         }
     }
 
@@ -327,9 +244,9 @@ public static void openConsole(File file) throws IOException {
                     LOGGER.error("Open console", exception);
 
                     JOptionPane.showMessageDialog(null,
-                            Localization.lang("Error occured while executing the command \"%0\".", commandLoggingText),
-                            Localization.lang("Open console") + " - " + Localization.lang("Error"),
-                            JOptionPane.ERROR_MESSAGE);
+                                                  Localization.lang("Error occured while executing the command \"%0\".", commandLoggingText),
+                                                  Localization.lang("Open console") + " - " + Localization.lang("Error"),
+                                                  JOptionPane.ERROR_MESSAGE);
                     JabRefGUI.getMainFrame().output(null);
                 }
             }

src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java

@@ -7,13 +7,12 @@
 
 import javax.swing.Icon;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileHelper;
 
 import org.slf4j.Logger;
@@ -25,30 +24,28 @@
  * to process the request if the user clicks this menu item.
  */
 public class ExternalFileMenuItem extends JMenuItem implements ActionListener {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ExternalFileMenuItem.class);
 
-    private final BibEntry entry;
     private final String link;
     private final BibDatabaseContext databaseContext;
     private Optional<ExternalFileType> fileType;
     private final JabRefFrame frame;
     private String fieldName;
 
-
-    public ExternalFileMenuItem(JabRefFrame frame, BibEntry entry, String name, String link, Icon icon,
-            BibDatabaseContext databaseContext, Optional<ExternalFileType> fileType) {
+    public ExternalFileMenuItem(JabRefFrame frame, String name, String link, Icon icon,
+                                BibDatabaseContext databaseContext, Optional<ExternalFileType> fileType) {
         super(name, icon);
         this.frame = frame;
-        this.entry = entry;
         this.link = link;
         this.databaseContext = databaseContext;
         this.fileType = fileType;
         addActionListener(this);
     }
 
-    public ExternalFileMenuItem(JabRefFrame frame, BibEntry entry, String name, String link, Icon icon,
-            BibDatabaseContext databaseContext, String fieldName) {
-        this(frame, entry, name, link, icon, databaseContext, Optional.empty());
+    public ExternalFileMenuItem(JabRefFrame frame, String name, String link, Icon icon,
+                                BibDatabaseContext databaseContext, String fieldName) {
+        this(frame, name, link, icon, databaseContext, Optional.empty());
         this.fieldName = fieldName;
     }
 
@@ -77,25 +74,21 @@ private boolean openLink() {
                 }
             }
 
-            if (type.isPresent() && (type.get() instanceof UnknownExternalFileType)) {
-                return JabRefDesktop.openExternalFileUnknown(frame, entry, databaseContext, link,
-                        (UnknownExternalFileType) type.get());
-            } else {
-                return JabRefDesktop.openExternalFileAnyFormat(databaseContext, link, type);
-            }
+            return JabRefDesktop.openExternalFileAnyFormat(databaseContext, link, type);
 
         } catch (IOException ex) {
             // See if we should show an error message concerning the application to open the
             // link with. We check if the file type is set, and if the file type has a non-empty
             // application link. If that link is referred by the error message, we can assume
             // that the problem is in the open-with-application setting:
             if ((fileType.isPresent()) && (!fileType.get().getOpenWithApplication().isEmpty())
-                    && ex.getMessage().contains(fileType.get().getOpenWithApplication())) {
+            && ex.getMessage().contains(fileType.get().getOpenWithApplication())) {
+
+                DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showErrorDialogAndWait(Localization.lang("Could not open link"),
+                Localization.lang("Unable to open link. " + "The application '%0' associated with the file type '%1' could not be called.",
+                fileType.get().getOpenWithApplication(),
+                fileType.get().getName())));
 
-                JOptionPane.showMessageDialog(null, Localization.lang("Unable to open link. "
-                                        + "The application '%0' associated with the file type '%1' could not be called.",
-                        fileType.get().getOpenWithApplication(), fileType.get().getName()),
-                        Localization.lang("Could not open link"), JOptionPane.ERROR_MESSAGE);
                 return false;
             }