Getting Rid of Swing

build.gradle

@@ -119,8 +119,6 @@ dependencies {
 
     compile 'org.postgresql:postgresql:42.2.6'
 
-    compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
-
     compile 'com.google.guava:guava:28.0-jre'
 
     // JavaFX stuff

src/main/java/org/jabref/gui/BasePanel.java

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,7 +13,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.swing.SwingUtilities;
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
 
@@ -45,12 +43,8 @@
 import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.gui.exporter.WriteXMPAction;
 import org.jabref.gui.externalfiles.FindFullTextAction;
-import org.jabref.gui.externalfiletype.ExternalFileMenuItem;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.filelist.FileListEntry;
-import org.jabref.gui.filelist.FileListTableModel;
-import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.importer.actions.AppendDatabaseAction;
 import org.jabref.gui.journals.AbbreviateAction;
 import org.jabref.gui.journals.UnabbreviateAction;
@@ -68,6 +62,7 @@
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.undo.UndoableInsertEntry;
 import org.jabref.gui.undo.UndoableRemoveEntry;
+import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.worker.SendAsEMailAction;
 import org.jabref.logic.citationstyle.CitationStyleCache;
@@ -93,6 +88,7 @@
 import org.jabref.model.database.shared.DatabaseSynchronizer;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
+import org.jabref.model.entry.FileFieldParser;
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.event.EntryChangedEvent;
@@ -571,24 +567,27 @@ private void openExternalFile() {
             output(Localization.lang("This operation requires exactly one item to be selected."));
             return;
         }
-        JabRefExecutorService.INSTANCE.execute(() -> {
-            final BibEntry entry = selectedEntries.get(0);
-            if (!entry.hasField(FieldName.FILE)) {
-                // no bibtex field
-                new SearchAndOpenFile(entry, BasePanel.this).searchAndOpen();
-                return;
-            }
-            FileListTableModel fileListTableModel = new FileListTableModel();
-            entry.getField(FieldName.FILE).ifPresent(fileListTableModel::setContent);
-            if (fileListTableModel.getRowCount() == 0) {
-                // content in BibTeX field is not readable
-                new SearchAndOpenFile(entry, BasePanel.this).searchAndOpen();
-                return;
-            }
-            FileListEntry flEntry = fileListTableModel.getEntry(0);
-            ExternalFileMenuItem item = new ExternalFileMenuItem(frame(), "", flEntry.getLink(), flEntry.getType().map(ExternalFileType::getIcon).map(JabRefIcon::getSmallIcon).orElse(null), bibDatabaseContext, flEntry.getType());
-            item.doClick();
-        });
+        final BibEntry entry = selectedEntries.get(0);
+        if (!entry.hasField(FieldName.FILE)) {
+            // no bibtex field
+            BackgroundTask.wrap(() -> new SearchAndOpenFile(entry, BasePanel.this).searchAndOpen()).executeWith(Globals.TASK_EXECUTOR);
+            return;
+        }
+
+        List<LinkedFile> files = new ArrayList<>();
+        entry.getField(FieldName.FILE).map(FileFieldParser::parse).ifPresent(files::addAll);
+
+        if (files.isEmpty()) {
+            // content in BibTeX field is not readable
+            BackgroundTask.wrap(() -> new SearchAndOpenFile(entry, BasePanel.this).searchAndOpen()).executeWith(Globals.TASK_EXECUTOR);
+            return;
+        }
+        LinkedFile flEntry = files.get(0);
+        try {
+            JabRefDesktop.openExternalFileAnyFormat(this.getBibDatabaseContext(), flEntry.getLink(), ExternalFileTypes.getInstance().fromLinkedFile(flEntry, true));
+        } catch (IOException ex) {
+            dialogService.showErrorDialogAndWait(ex);
+        }
     }
 
     /**
@@ -948,8 +947,7 @@ public void entryEditorClosing(EntryEditor editor) {
      * Closes the entry editor or preview panel if it is showing the given entry.
      */
     public void ensureNotShowingBottomPanel(BibEntry entry) {
-        if (((mode == BasePanelMode.SHOWING_EDITOR) && (entryEditor.getEntry() == entry))
-                || ((mode == BasePanelMode.SHOWING_PREVIEW))) {
+        if (((mode == BasePanelMode.SHOWING_EDITOR) && (entryEditor.getEntry() == entry)) || ((mode == BasePanelMode.SHOWING_PREVIEW))) {
             closeBottomPane();
         }
     }
@@ -963,16 +961,7 @@ public void updateEntryEditorIfShowing() {
 
     public void markBaseChanged() {
         baseChanged = true;
-
-        if (SwingUtilities.isEventDispatchThread()) {
-            markBasedChangedInternal();
-        } else {
-            try {
-                SwingUtilities.invokeAndWait(() -> markBasedChangedInternal());
-            } catch (InvocationTargetException | InterruptedException e) {
-                LOGGER.info("Problem marking database as changed", e);
-            }
-        }
+        markBasedChangedInternal();
     }
 
     private void markBasedChangedInternal() {

src/main/java/org/jabref/gui/GUIGlobals.java

@@ -1,11 +1,10 @@
 package org.jabref.gui;
 
-import java.awt.Color;
-import java.awt.Font;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
 
 import org.jabref.Globals;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.keyboard.EmacsKeyBindings;
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
@@ -45,20 +44,15 @@ public static void updateEntryEditorColors() {
      * on Un*x is unavailable.
      */
     public static void init() {
-        if (Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS)) {
-            EmacsKeyBindings.load();
-        }
-
         // Set up entry editor colors, first time:
         GUIGlobals.updateEntryEditorColors();
 
         IconTheme.loadFonts();
-        GUIGlobals.currentFont = new Font(Globals.prefs.get(JabRefPreferences.FONT_FAMILY),
-                                          Globals.prefs.getInt(JabRefPreferences.FONT_STYLE), Globals.prefs.getInt(JabRefPreferences.FONT_SIZE));
+        GUIGlobals.currentFont = new Font(Globals.prefs.getFontFamily(), Globals.prefs.getDouble(JabRefPreferences.FONT_SIZE));
     }
 
-    public static void setFont(int size) {
-        currentFont = new Font(currentFont.getFamily(), currentFont.getStyle(), size);
+    public static void setFont(double size) {
+        currentFont = new Font(currentFont.getFamily(), size);
         // update preferences
         Globals.prefs.putInt(JabRefPreferences.FONT_SIZE, size);
     }

src/main/java/org/jabref/gui/JabRefFrame.java

@@ -14,9 +14,6 @@
 import java.util.TimerTask;
 import java.util.stream.Collectors;
 
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -294,9 +291,7 @@ private void initShowTrackingNotification() {
 
                 @Override
                 public void run() {
-                    SwingUtilities.invokeLater(() -> {
                         DefaultTaskExecutor.runInJavaFXThread(JabRefFrame.this::showTrackingNotification);
-                    });
                 }
             }, 60000); // run in one minute
         }
@@ -402,6 +397,8 @@ private void tearDownJabRef(List<String> filenames) {
         prefs.flush();
 
         // dispose all windows, even if they are not displayed anymore
+        // TODO: javafx variant only avaiable in java 9 and updwards
+        // https://docs.oracle.com/javase/9/docs/api/javafx/stage/Window.html#getWindows--
         for (Window window : Window.getWindows()) {
             window.dispose();
         }
@@ -1063,18 +1060,9 @@ public void setProgressBarVisible(final boolean visible) {
     /**
      * Sets the indeterminate status of the progress bar.
      * <p>
-     * If not called on the event dispatch thread, this method uses SwingUtilities.invokeLater() to do the actual
-     * operation on the EDT.
      */
     public void setProgressBarIndeterminate(final boolean value) {
-        // TODO: Reimplement
-        /*
-        if (SwingUtilities.isEventDispatchThread()) {
-            progressBar.setIndeterminate(value);
-        } else {
-            SwingUtilities.invokeLater(() -> progressBar.setIndeterminate(value));
-        }
-        */
+        progressBar.setProgress(ProgressBar.INDETERMINATE_PROGRESS);
     }
 
     /**
@@ -1107,10 +1095,6 @@ private boolean isExistURLorDOI(List<BibEntry> selectEntryList) {
         return false;
     }
 
-    public void showMessage(String message) {
-        JOptionPane.showMessageDialog(null, message);
-    }
-
     /**
      * Ask if the user really wants to close the given database
      *
@@ -1297,7 +1281,7 @@ private void increaseTableFontSize() {
     }
 
     private void decreaseTableFontSize() {
-        int currentSize = GUIGlobals.currentFont.getSize();
+        double currentSize = GUIGlobals.currentFont.getSize();
         if (currentSize < 2) {
             return;
         }