From c16f733b8f4cc3a06760e3f3ad3b4d07c08879c4 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Fri, 8 Mar 2019 15:31:42 +0100
Subject: [PATCH] Convert "Manage external file types" dialog to JavaFX (#4711)

* Convert "Manage external file types" dialog to JavaFX

* Fix language file
---
 .../actions/EditExternalFileTypesAction.java  |   6 +-
 .../CustomizeExternalFileTypesDialog.fxml     |  39 +++
 .../CustomizeExternalFileTypesDialog.java     |  86 +++++
 .../CustomizeExternalFileTypesViewModel.java  |  59 ++++
 .../ExternalFileTypeEditor.java               | 321 ------------------
 .../ExternalFileTypeEntryEditor.java          |  10 -
 .../jabref/gui/preferences/ExternalTab.java   |   4 +-
 src/main/resources/l10n/JabRef_en.properties  |   4 +-
 8 files changed, 191 insertions(+), 338 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesDialog.java
 create mode 100644 src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesViewModel.java
 delete mode 100644 src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java

diff --git a/src/main/java/org/jabref/gui/actions/EditExternalFileTypesAction.java b/src/main/java/org/jabref/gui/actions/EditExternalFileTypesAction.java
index 82bbc9123ce..c5ea26bb8cb 100644
--- a/src/main/java/org/jabref/gui/actions/EditExternalFileTypesAction.java
+++ b/src/main/java/org/jabref/gui/actions/EditExternalFileTypesAction.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.actions;
 
-import org.jabref.gui.externalfiletype.ExternalFileTypeEditor;
+import org.jabref.gui.externalfiletype.CustomizeExternalFileTypesDialog;
 
 public class EditExternalFileTypesAction extends SimpleCommand {
 
     @Override
     public void execute() {
-        ExternalFileTypeEditor editor = new ExternalFileTypeEditor();
-        editor.show();
+        CustomizeExternalFileTypesDialog editor = new CustomizeExternalFileTypesDialog();
+        editor.showAndWait();
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesDialog.fxml b/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesDialog.fxml
new file mode 100644
index 00000000000..6489e52a788
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesDialog.fxml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<DialogPane xmlns:fx="http://javafx.com/fxml"
+            xmlns="http://javafx.com/javafx"
+            fx:controller="org.jabref.gui.externalfiletype.CustomizeExternalFileTypesDialog"
+            prefHeight="500.0" prefWidth="750.0">
+    <content>
+        <VBox spacing="10">
+            <TableView fx:id="fileTypesTable" VBox.vgrow="ALWAYS">
+                <columns>
+                    <TableColumn fx:id="fileTypesTableIconColumn" minWidth="40.0" maxWidth="40.0"/>
+                    <TableColumn fx:id="fileTypesTableNameColumn" text="%Name"/>
+                    <TableColumn fx:id="fileTypesTableExtensionColumn" text="%Extension" prefWidth="120"/>
+                    <TableColumn fx:id="fileTypesTableTypeColumn" text="%MIME type" prefWidth="150"/>
+                    <TableColumn fx:id="fileTypesTableApplicationColumn" text="%Application" prefWidth="100"/>
+                    <TableColumn fx:id="fileTypesTableEditColumn" minWidth="40.0" maxWidth="40.0"/>
+                    <TableColumn fx:id="fileTypesTableDeleteColumn" minWidth="40.0" maxWidth="40.0"/>
+                </columns>
+                <columnResizePolicy>
+                    <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+                </columnResizePolicy>
+            </TableView>
+            <HBox>
+                <Button text="%Add new file type" onAction="#addNewType"/>
+                <HBox HBox.hgrow="ALWAYS"/>
+                <Button text="%Reset to default" onAction="#resetToDefault" styleClass="text-button"/>
+            </HBox>
+        </VBox>
+    </content>
+    <ButtonType fx:constant="OK"/>
+    <ButtonType fx:constant="CANCEL"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesDialog.java b/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesDialog.java
new file mode 100644
index 00000000000..e7a2d1492ef
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesDialog.java
@@ -0,0 +1,86 @@
+package org.jabref.gui.externalfiletype;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.icon.JabRefIcon;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.BindingsHelper;
+import org.jabref.gui.util.ValueTableCellFactory;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+/**
+ * Editor for external file types.
+ */
+public class CustomizeExternalFileTypesDialog extends BaseDialog<Void> {
+
+    @FXML private TableColumn<ExternalFileType, JabRefIcon> fileTypesTableIconColumn;
+    @FXML private TableColumn<ExternalFileType, String> fileTypesTableNameColumn;
+    @FXML private TableColumn<ExternalFileType, String> fileTypesTableExtensionColumn;
+    @FXML private TableColumn<ExternalFileType, String> fileTypesTableTypeColumn;
+    @FXML private TableColumn<ExternalFileType, String> fileTypesTableApplicationColumn;
+    @FXML private TableColumn<ExternalFileType, Boolean> fileTypesTableEditColumn;
+    @FXML private TableColumn<ExternalFileType, Boolean> fileTypesTableDeleteColumn;
+    @FXML private TableView<ExternalFileType> fileTypesTable;
+
+    private CustomizeExternalFileTypesViewModel viewModel;
+
+    public CustomizeExternalFileTypesDialog() {
+        this.setTitle(Localization.lang("Manage external file types"));
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        this.setResultConverter(button -> {
+            if (button == ButtonType.OK) {
+                viewModel.storeSettings();
+            }
+            return null;
+        });
+    }
+
+    @FXML
+    public void initialize() {
+        viewModel = new CustomizeExternalFileTypesViewModel();
+
+        fileTypesTable.setItems(viewModel.getFileTypes());
+
+        fileTypesTableIconColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getIcon()));
+        fileTypesTableNameColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getName()));
+        fileTypesTableExtensionColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getExtension()));
+        fileTypesTableTypeColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getMimeType()));
+        fileTypesTableApplicationColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getOpenWithApplication()));
+        fileTypesTableEditColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
+        fileTypesTableDeleteColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
+
+        new ValueTableCellFactory<ExternalFileType, JabRefIcon>()
+                .withGraphic(JabRefIcon::getGraphicNode)
+                .install(fileTypesTableIconColumn);
+        new ValueTableCellFactory<ExternalFileType, Boolean>()
+                .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
+                .withOnMouseClickedEvent((type, none) -> event -> viewModel.edit(type))
+                .install(fileTypesTableEditColumn);
+        new ValueTableCellFactory<ExternalFileType, Boolean>()
+                .withGraphic(none -> IconTheme.JabRefIcons.REMOVE.getGraphicNode())
+                .withOnMouseClickedEvent((type, none) -> event -> viewModel.remove(type))
+                .install(fileTypesTableDeleteColumn);
+    }
+
+    @FXML
+    private void addNewType() {
+        viewModel.addNewType();
+        fileTypesTable.getSelectionModel().selectLast();
+        fileTypesTable.scrollTo(viewModel.getFileTypes().size() - 1);
+    }
+
+    @FXML
+    private void resetToDefault() {
+        viewModel.resetToDefaults();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesViewModel.java b/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesViewModel.java
new file mode 100644
index 00000000000..5d8c68e9fa4
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiletype/CustomizeExternalFileTypesViewModel.java
@@ -0,0 +1,59 @@
+package org.jabref.gui.externalfiletype;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.gui.icon.IconTheme;
+
+public class CustomizeExternalFileTypesViewModel {
+    private ObservableList<ExternalFileType> fileTypes;
+
+    public CustomizeExternalFileTypesViewModel() {
+        Set<ExternalFileType> types = ExternalFileTypes.getInstance().getExternalFileTypeSelection();
+        fileTypes = FXCollections.observableArrayList(types);
+        fileTypes.sort(Comparator.comparing(ExternalFileType::getName));
+    }
+
+    /**
+     * Stores the list of external entry types in the preferences.
+     */
+    public void storeSettings() {
+        ExternalFileTypes.getInstance().setExternalFileTypes(fileTypes);
+    }
+
+    public void resetToDefaults() {
+        List<ExternalFileType> list = ExternalFileTypes.getDefaultExternalFileTypes();
+        fileTypes.setAll(list);
+        fileTypes.sort(Comparator.comparing(ExternalFileType::getName));
+    }
+
+    public void addNewType() {
+        CustomExternalFileType type = new CustomExternalFileType("", "", "", "", "new", IconTheme.JabRefIcons.FILE);
+        fileTypes.add(type);
+        edit(type);
+    }
+
+    public ObservableList<ExternalFileType> getFileTypes() {
+        return fileTypes;
+    }
+
+    public void edit(ExternalFileType type) {
+        CustomExternalFileType typeForEdit;
+        if (type instanceof CustomExternalFileType) {
+            typeForEdit = (CustomExternalFileType) type;
+        } else {
+            typeForEdit = new CustomExternalFileType(type);
+        }
+
+        ExternalFileTypeEntryEditor entryEditor = new ExternalFileTypeEntryEditor(typeForEdit);
+        entryEditor.setVisible(true);
+    }
+
+    public void remove(ExternalFileType type) {
+        fileTypes.remove(type);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java
deleted file mode 100644
index ce1192c5d47..00000000000
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java
+++ /dev/null
@@ -1,321 +0,0 @@
-package org.jabref.gui.externalfiletype;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableCellRenderer;
-
-import javafx.scene.control.ButtonType;
-import javafx.stage.Modality;
-
-import org.jabref.gui.actions.MnemonicAwareAction;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.icon.JabRefIcon;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.ControlHelper;
-import org.jabref.logic.l10n.Localization;
-
-import com.jgoodies.forms.builder.ButtonStackBuilder;
-
-/**
- * Editor for external file types.
- */
-public class ExternalFileTypeEditor extends BaseDialog<Void> {
-
-    private List<ExternalFileType> fileTypes;
-    private JTable table;
-    private ExternalFileTypeEntryEditor entryEditor;
-    private FileTypeTableModel tableModel;
-    private final JButton add = new JButton(IconTheme.JabRefIcons.ADD_NOBOX.getIcon());
-    private final JButton remove = new JButton(IconTheme.JabRefIcons.REMOVE_NOBOX.getIcon());
-    private final JButton edit = new JButton(IconTheme.JabRefIcons.EDIT.getIcon());
-    private final JButton toDefaults = new JButton(Localization.lang("Default"));
-    private final EditListener editListener = new EditListener();
-
-    public ExternalFileTypeEditor() {
-        this.setTitle(Localization.lang("Manage external file types"));
-        this.initModality(Modality.APPLICATION_MODAL);
-        this.getDialogPane().setPrefSize(600, 500);
-
-        init();
-    }
-
-    /**
-     * Update the editor to show the current settings in Preferences.
-     */
-    private void setValues() {
-        fileTypes.clear();
-        Collection<ExternalFileType> types = ExternalFileTypes.getInstance().getExternalFileTypeSelection();
-        fileTypes.addAll(types);
-        fileTypes.sort(Comparator.comparing(ExternalFileType::getName));
-    }
-
-    /**
-     * Store the list of external entry types to Preferences.
-     */
-    private void storeSettings() {
-        ExternalFileTypes.getInstance().setExternalFileTypes(fileTypes);
-    }
-
-    /**
-     * Get an AbstractAction for opening the external file types editor.
-     *
-     * @return An Action for opening the editor.
-     */
-    public static AbstractAction getAction() {
-        return new EditExternalFileTypesAction();
-    }
-
-    private void init() {
-
-        this.getDialogPane().getButtonTypes().setAll(
-                ButtonType.CANCEL,
-                ButtonType.OK
-        );
-
-        this.setResultConverter(button -> {
-            if (button == ButtonType.OK) {
-                storeSettings();
-            }
-            return null;
-        });
-
-        // The toDefaults resets the entire list to its default values.
-        toDefaults.addActionListener(e -> {
-            /*int reply = JOptionPane.showConfirmDialog(ExternalFileTypeEditor.this,
-                    Globals.lang("All custom file types will be lost. Proceed?"),
-                    Globals.lang("Reset file type definitions"), JOptionPane.YES_NO_OPTION,
-                    JOptionPane.QUESTION_MESSAGE);*/
-            //if (reply == JOptionPane.YES_OPTION) {
-            List<ExternalFileType> list = ExternalFileTypes.getDefaultExternalFileTypes();
-            fileTypes.clear();
-            fileTypes.addAll(list);
-            fileTypes.sort(Comparator.comparing(ExternalFileType::getName));
-            //Globals.prefs.resetExternalFileTypesToDefault();
-            //setValues();
-            tableModel.fireTableDataChanged();
-            //}
-        });
-
-        add.addActionListener(e -> {
-            // Generate a new file type:
-            CustomExternalFileType type = new CustomExternalFileType("", "", "", "", "new",
-                    IconTheme.JabRefIcons.FILE);
-            // Show the file type editor:
-            getEditor(type).setVisible(true);
-            if (entryEditor.okPressed()) {
-                // Ok was pressed. Add the new file type and update the table:
-                fileTypes.add(type);
-                tableModel.fireTableDataChanged();
-            }
-        });
-
-        remove.addActionListener(e -> {
-            int[] rows = table.getSelectedRows();
-            if (rows.length == 0) {
-                return;
-            }
-            for (int i = rows.length - 1; i >= 0; i--) {
-                fileTypes.remove(rows[i]);
-            }
-            tableModel.fireTableDataChanged();
-            if (!fileTypes.isEmpty()) {
-                int row = Math.min(rows[0], fileTypes.size() - 1);
-                table.setRowSelectionInterval(row, row);
-            }
-        });
-
-        edit.addActionListener(editListener);
-        fileTypes = new ArrayList<>();
-        setValues();
-
-        tableModel = new FileTypeTableModel();
-        table = new JTable(tableModel);
-        table.setDefaultRenderer(ImageIcon.class, new IconRenderer());
-        table.addMouseListener(new TableClickListener());
-
-        table.getColumnModel().getColumn(0).setMaxWidth(24);
-        table.getColumnModel().getColumn(0).setMinWidth(24);
-        table.getColumnModel().getColumn(1).setMinWidth(170);
-        table.getColumnModel().getColumn(2).setMinWidth(60);
-        table.getColumnModel().getColumn(3).setMinWidth(100);
-        table.getColumnModel().getColumn(0).setResizable(false);
-
-        JScrollPane sp = new JScrollPane(table);
-
-        JPanel upper = new JPanel();
-        upper.setLayout(new BorderLayout());
-        upper.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        upper.add(sp, BorderLayout.CENTER);
-        ControlHelper.setSwingContent(getDialogPane(), upper);
-
-        ButtonStackBuilder bs = new ButtonStackBuilder();
-        bs.addButton(add);
-        bs.addButton(remove);
-        bs.addButton(edit);
-        bs.addRelatedGap();
-        bs.addButton(toDefaults);
-        upper.add(bs.getPanel(), BorderLayout.EAST);
-    }
-
-    private ExternalFileTypeEntryEditor getEditor(ExternalFileType type) {
-        CustomExternalFileType typeForEdit;
-        if (type instanceof CustomExternalFileType) {
-            typeForEdit = (CustomExternalFileType) type;
-        } else {
-            typeForEdit = new CustomExternalFileType(type);
-        }
-
-        if (entryEditor == null) {
-            entryEditor = new ExternalFileTypeEntryEditor(typeForEdit);
-        } else {
-            entryEditor.setEntry(typeForEdit);
-        }
-        return entryEditor;
-    }
-
-    class EditListener implements ActionListener {
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int[] rows = table.getSelectedRows();
-            if (rows.length != 1) {
-                return;
-            }
-            getEditor(fileTypes.get(rows[0])).setVisible(true);
-            if (entryEditor.okPressed()) {
-                tableModel.fireTableDataChanged();
-            }
-        }
-    }
-
-    static class IconRenderer implements TableCellRenderer {
-
-        private final JLabel lab = new JLabel();
-
-        @Override
-        public Component getTableCellRendererComponent(JTable tab, Object value, boolean isSelected, boolean hasFocus,
-                int row, int column) {
-            lab.setText(null);
-            lab.setIcon(((JabRefIcon) value).getIcon());
-            return lab;
-        }
-    }
-
-    private class FileTypeTableModel extends AbstractTableModel {
-
-        @Override
-        public int getColumnCount() {
-            return 5;
-        }
-
-        @Override
-        public int getRowCount() {
-            return fileTypes.size();
-        }
-
-        @Override
-        public String getColumnName(int column) {
-            switch (column) {
-            case 0:
-                return " ";
-            case 1:
-                return Localization.lang("Name");
-            case 2:
-                return Localization.lang("Extension");
-            case 3:
-                return Localization.lang("MIME type");
-            default: // Five columns
-                return Localization.lang("Application");
-            }
-        }
-
-        @Override
-        public Class<?> getColumnClass(int columnIndex) {
-            if (columnIndex == 0) {
-                return ImageIcon.class;
-            } else {
-                return String.class;
-            }
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            ExternalFileType type = fileTypes.get(rowIndex);
-            switch (columnIndex) {
-            case 0:
-                return type.getIcon();
-            case 1:
-                return type.getName();
-            case 2:
-                return type.getExtension();
-            case 3:
-                return type.getMimeType();
-            default:
-                return type.getOpenWithApplication();
-            }
-        }
-    }
-
-    class TableClickListener extends MouseAdapter {
-
-        private void handleClick(MouseEvent e) {
-            if (e.getClickCount() == 2) {
-                editListener.actionPerformed(null);
-            }
-        }
-
-        @Override
-        public void mouseClicked(MouseEvent e) {
-            handleClick(e);
-        }
-
-        @Override
-        public void mousePressed(MouseEvent e) {
-            handleClick(e);
-        }
-
-        @Override
-        public void mouseReleased(MouseEvent e) {
-            handleClick(e);
-        }
-    }
-
-    public static class EditExternalFileTypesAction extends MnemonicAwareAction {
-
-        private ExternalFileTypeEditor editor;
-
-        public EditExternalFileTypesAction() {
-            super();
-            putValue(Action.NAME, Localization.lang("Manage external file types"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            if (editor == null) {
-                editor = new ExternalFileTypeEditor();
-            }
-            editor.setValues();
-            editor.show();
-        }
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java
index a28fcb73d65..e620e69e84b 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java
@@ -178,16 +178,6 @@ public void changedUpdate(DocumentEvent documentEvent) {
         setValues(entry);
     }
 
-    public void setEntry(CustomExternalFileType entry) {
-        this.entry = entry;
-        if (entry.getName().isEmpty()) {
-            diag.setTitle(newFileTitle);
-        } else {
-            diag.setTitle(editFileTitle);
-        }
-        setValues(entry);
-    }
-
     public void setVisible(boolean visible) {
         if (visible) {
             okPressed = false;
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.java b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
index 0328eaf4e1b..e872abeadb4 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
@@ -12,7 +12,7 @@
 import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.externalfiletype.ExternalFileTypeEditor;
+import org.jabref.gui.actions.EditExternalFileTypesAction;
 import org.jabref.gui.push.PushToApplication;
 import org.jabref.gui.push.PushToApplicationSettings;
 import org.jabref.gui.push.PushToApplicationSettingsDialog;
@@ -47,7 +47,7 @@ public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPrefere
         dialogService = frame.getDialogService();
         Button editFileTypes = new Button(Localization.lang("Manage external file types"));
         citeCommand = new TextField();
-        editFileTypes.setOnAction(e -> ExternalFileTypeEditor.getAction());
+        editFileTypes.setOnAction(e -> new EditExternalFileTypesAction().execute());
         defaultConsole = new RadioButton(Localization.lang("Use default terminal emulator"));
         executeConsole = new RadioButton(Localization.lang("Execute command") + ":");
         consoleCommand = new TextField();
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 54ccec1845d..b8bfd4a718d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2150,7 +2150,7 @@ Keyword\:=Keyword:
 Keyword\ \"%0\"\ already\ exists=Keyword "%0" already exists
 Remove\ keyword=Remove keyword
 Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ \"%0\"?=Are you sure you want to remove keyword: "%0"?
-
+Reset\ to\ default=Reset to default
 Edit\ string\ constants=Edit string constants
 Export\ all\ entries=Export all entries
 Generate\ BibTeX\ keys=Generate BibTeX keys
@@ -2165,4 +2165,4 @@ Previous\ citation\ style=Previous citation style
 Search\ document\ identifier\ online=Search document identifier online
 Search\ for\ unlinked\ local\ files=Search for unlinked local files
 Search\ full\ text\ documents\ online=Search full text documents online
-Find\ and\ replace=Find and replace
\ No newline at end of file
+Find\ and\ replace=Find and replace