From 67ed3aaff19533ffbe5f53897418e8403d56902b Mon Sep 17 00:00:00 2001
From: siedlerchr <siedlerkiller@gmail.com>
Date: Thu, 6 Jul 2017 17:17:22 +0200
Subject: [PATCH 01/36] javafx replacement for file dialog

---
 .../org/jabref/gui/SelectFilesDialog.fxml     | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 src/main/resources/org/jabref/gui/SelectFilesDialog.fxml

diff --git a/src/main/resources/org/jabref/gui/SelectFilesDialog.fxml b/src/main/resources/org/jabref/gui/SelectFilesDialog.fxml
new file mode 100644
index 00000000000..a2e27d20a9d
--- /dev/null
+++ b/src/main/resources/org/jabref/gui/SelectFilesDialog.fxml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+
+<DialogPane prefHeight="100.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
+   <content>
+      <VBox maxWidth="1.7976931348623157E308">
+         <children>
+            <HBox prefHeight="100.0" spacing="10.0">
+               <children>
+                  <Label maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="95.0" text="Link">
+                     <padding>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </padding>
+                  </Label>
+                  <TextField fx:id="tfLink" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" />
+                  <Button fx:id="btnBrowse" minWidth="-Infinity" mnemonicParsing="false" onAction="#browseFileDialog" text="Browse" />
+                  <Button fx:id="btnOpen" minWidth="-Infinity" mnemonicParsing="false" onAction="#openFile" text="Open">
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets top="10.0" />
+               </padding>
+            </HBox>
+            <HBox layoutX="21.0" layoutY="21.0" prefHeight="100.0" spacing="10.0">
+               <children>
+                  <Label minWidth="95.0" text="Description">
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                     <padding>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </padding>
+                  </Label>
+                  <TextField fx:id="tfDescription" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" />
+               </children>
+            </HBox>
+            <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0">
+               <children>
+                  <Label minWidth="95.0" text="File type">
+                     <padding>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </padding>
+                  </Label>
+                  <ComboBox fx:id="cmbFileType" />
+               </children>
+            </HBox>
+            <ButtonBar>
+              <buttons>
+                <Button defaultButton="true" mnemonicParsing="false" text="OK" />
+                  <Button cancelButton="true" mnemonicParsing="false" text="Cancel" />
+              </buttons>
+            </ButtonBar>
+         </children>
+      </VBox>
+   </content>
+</DialogPane>

From 136a844da955bde28ba4da7a1d26f796b67786a9 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 15 Jul 2017 12:23:07 +0200
Subject: [PATCH 02/36] Add some core structure for selectFilesDialog

---
 .../filelist/FileListDialogController.java    | 80 +++++++++++++++++++
 .../gui/filelist/FileListDialogView.java      | 19 +++++
 .../gui/filelist/FileListDialogViewModel.java |  7 ++
 .../gui/{ => filelist}/SelectFilesDialog.fxml |  7 +-
 4 files changed, 109 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/filelist/FileListDialogController.java
 create mode 100644 src/main/java/org/jabref/gui/filelist/FileListDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
 rename src/main/resources/org/jabref/gui/{ => filelist}/SelectFilesDialog.fxml (88%)

diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
new file mode 100644
index 00000000000..6c82fa6f5aa
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
@@ -0,0 +1,80 @@
+package org.jabref.gui.filelist;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
+
+import org.jabref.Globals;
+import org.jabref.gui.AbstractController;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.model.util.FileHelper;
+import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.PreferencesService;
+
+public class FileListDialogController extends AbstractController<FileListDialogViewModel> {
+
+
+    @FXML private TextField tfLink;
+    @FXML private Button btnBrowse;
+    @FXML private Button btnOpen;
+    @FXML private TextField tfDescription;
+    @FXML private ComboBox<ExternalFileType> cmbFileType;
+    @FXML private Button btnOk;
+    @FXML private Button btnCancel;
+
+    @Inject private PreferencesService preferences;
+    @Inject private DialogService dialogService;
+    @Inject private StateManager stateManager;
+    private boolean showSaveDialog;
+
+    @FXML
+    private void initialize() {
+        viewModel = new FileListDialogViewModel();
+    }
+
+    @FXML
+    void browseFileDialog(ActionEvent event) {
+        String fileText = tfLink.getText().trim();
+        Optional<Path> file = FileHelper.expandFilename(stateManager.getActiveDatabase().get(), fileText,
+                Globals.prefs.getFileDirectoryPreferences());
+
+        Path workingDir = file.orElse(Paths.get(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)));
+        String fileName = Paths.get(fileText).getFileName().toString();
+
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .withInitialDirectory(workingDir)
+                .withInitialFileName(fileName).build();
+        Optional<Path> path;
+        if (showSaveDialog) {
+            path = dialogService.showFileSaveDialog(fileDialogConfiguration);
+        } else {
+            path = dialogService.showFileOpenDialog(fileDialogConfiguration);
+        }
+    }
+
+    @FXML
+    void cancel(ActionEvent event) {
+        getStage().close();
+    }
+
+    @FXML
+    void ok_clicked(ActionEvent event) {
+
+    }
+
+    @FXML
+    void openFile(ActionEvent event) {
+
+    }
+}
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogView.java b/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
new file mode 100644
index 00000000000..49ca84d1eb4
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
@@ -0,0 +1,19 @@
+package org.jabref.gui.filelist;
+
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.DialogPane;
+
+import org.jabref.gui.AbstractDialogView;
+import org.jabref.gui.FXDialog;
+
+public class FileListDialogView extends AbstractDialogView {
+
+    @Override
+    public void show() {
+        FXDialog filelistDialog = new FXDialog(AlertType.INFORMATION, "FileLIstDialog ");
+        filelistDialog.setDialogPane((DialogPane) this.getView());
+        filelistDialog.setResizable(true);
+        filelistDialog.show();
+
+    }
+}
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
new file mode 100644
index 00000000000..02c5614ca69
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
@@ -0,0 +1,7 @@
+package org.jabref.gui.filelist;
+
+import org.jabref.gui.AbstractViewModel;
+
+public class FileListDialogViewModel extends AbstractViewModel {
+    //
+}
diff --git a/src/main/resources/org/jabref/gui/SelectFilesDialog.fxml b/src/main/resources/org/jabref/gui/filelist/SelectFilesDialog.fxml
similarity index 88%
rename from src/main/resources/org/jabref/gui/SelectFilesDialog.fxml
rename to src/main/resources/org/jabref/gui/filelist/SelectFilesDialog.fxml
index a2e27d20a9d..25c9238fe9b 100644
--- a/src/main/resources/org/jabref/gui/SelectFilesDialog.fxml
+++ b/src/main/resources/org/jabref/gui/filelist/SelectFilesDialog.fxml
@@ -10,8 +10,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-
-<DialogPane prefHeight="100.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
+<DialogPane prefHeight="100.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.FileLIstDialogController">
    <content>
       <VBox maxWidth="1.7976931348623157E308">
          <children>
@@ -59,8 +58,8 @@
             </HBox>
             <ButtonBar>
               <buttons>
-                <Button defaultButton="true" mnemonicParsing="false" text="OK" />
-                  <Button cancelButton="true" mnemonicParsing="false" text="Cancel" />
+                <Button fx:id="btnOk" defaultButton="true" mnemonicParsing="false" onAction="#ok_clicked" text="OK" />
+                  <Button fx:id="btnCancel" cancelButton="true" mnemonicParsing="false" onAction="#cancel" text="Cancel" />
               </buttons>
             </ButtonBar>
          </children>

From b3d764138e099842d375cb08fde8c0d204e8bdc0 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 31 Jul 2017 20:39:16 +0200
Subject: [PATCH 03/36] Add Properties for binding

---
 .../gui/filelist/FileListDialogController.java   | 15 +++++++++++++++
 .../gui/filelist/FileListDialogViewModel.java    | 16 ++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
index 6c82fa6f5aa..6b70e73f289 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
@@ -2,6 +2,7 @@
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -18,6 +19,7 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
@@ -36,6 +38,7 @@ public class FileListDialogController extends AbstractController<FileListDialogV
     @Inject private PreferencesService preferences;
     @Inject private DialogService dialogService;
     @Inject private StateManager stateManager;
+
     private boolean showSaveDialog;
 
     @FXML
@@ -61,6 +64,18 @@ void browseFileDialog(ActionEvent event) {
         } else {
             path = dialogService.showFileOpenDialog(fileDialogConfiguration);
         }
+        path.ifPresent(newFile -> {
+            // Store the directory for next time:
+            Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, newFile.toString());
+
+            // If the file is below the file directory, make the path relative:
+            List<Path> fileDirectories = this.stateManager.getActiveDatabase().get()
+                    .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+            newFile = FileUtil.shortenFileName(newFile, fileDirectories);
+
+            tfLink.setText(newFile.toString());
+            tfLink.requestFocus();
+        });
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
index 02c5614ca69..ecca0b00ecf 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
@@ -1,7 +1,23 @@
 package org.jabref.gui.filelist;
 
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+
 import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.externalfiletype.ExternalFileType;
 
 public class FileListDialogViewModel extends AbstractViewModel {
+
+    private final StringProperty linkProperty = new SimpleStringProperty();
+    private final StringProperty descriptionProperty = new SimpleStringProperty();
+    private final ListProperty<ExternalFileType> externalfilesTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
+
+    public FileListDialogViewModel() {
+
+
+    }
     //
 }

From 24c35c562eaaf6c85cc7b611e401e531d0d582b8 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 31 Jul 2017 20:47:54 +0200
Subject: [PATCH 04/36] add getters

---
 .../jabref/gui/filelist/FileListDialogViewModel.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
index ecca0b00ecf..1eb09b51706 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
@@ -20,4 +20,16 @@ public FileListDialogViewModel() {
 
     }
     //
+
+    public StringProperty getLinkProperty() {
+        return linkProperty;
+    }
+
+    public StringProperty getDescriptionProperty() {
+        return descriptionProperty;
+    }
+
+    public ListProperty<ExternalFileType> getExternalfilesTypes() {
+        return externalfilesTypes;
+    }
 }

From dfde523b8004c097c760232ead3b1373ff58f4bb Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 6 Aug 2017 15:51:02 +0200
Subject: [PATCH 05/36] Renaming, use properties in controller open dialog with
 attach file action

---
 .../jabref/gui/filelist/AttachFileAction.java   | 17 +++++++++--------
 .../gui/filelist/FileListDialogController.java  | 14 ++++++++++++--
 .../gui/filelist/FileListDialogViewModel.java   | 12 +++++++-----
 .../gui/filelist/FileListEntryEditor.java       |  3 +++
 ...lectFilesDialog.fxml => FileListDialog.fxml} |  2 +-
 5 files changed, 32 insertions(+), 16 deletions(-)
 rename src/main/resources/org/jabref/gui/filelist/{SelectFilesDialog.fxml => FileListDialog.fxml} (98%)

diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index 10dc75f6a01..60b210cb4e8 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -1,21 +1,17 @@
 package org.jabref.gui.filelist;
 
-import java.util.Optional;
+import javafx.application.Platform;
 
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.actions.BaseAction;
-import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.LinkedFile;
 
 public class AttachFileAction implements BaseAction {
 
     private final BasePanel panel;
 
-
     public AttachFileAction(BasePanel panel) {
         this.panel = panel;
     }
@@ -28,18 +24,23 @@ public void action() {
         }
         BibEntry entry = panel.getSelectedEntries().get(0);
         LinkedFile flEntry = new LinkedFile("", "", "");
-        FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true,
+
+        FileListDialogView dlg = new FileListDialogView();
+
+        Platform.runLater(() -> dlg.show());
+        /*   FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true,
                 panel.getBibDatabaseContext());
         editor.setVisible(true, true);
+        
         if (editor.okPressed()) {
             Optional<FieldChange> fieldChange = entry.addFile(flEntry);
-
+        
             if (fieldChange.isPresent()) {
                 UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE,
                         entry.getField(FieldName.FILE).orElse(null), fieldChange.get().getNewValue());
                 panel.getUndoManager().addEdit(ce);
                 panel.markBaseChanged();
             }
-        }
+        }*/
     }
 }
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
index 6b70e73f289..e7308985862 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
@@ -44,11 +44,21 @@ public class FileListDialogController extends AbstractController<FileListDialogV
     @FXML
     private void initialize() {
         viewModel = new FileListDialogViewModel();
+        setBindings();
+    }
+
+    private void setBindings() {
+
+        cmbFileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
+        tfDescription.textProperty().bindBidirectional(viewModel.descriptionProperty());
+        tfLink.textProperty().bindBidirectional(viewModel.linkProperty());
     }
 
     @FXML
     void browseFileDialog(ActionEvent event) {
-        String fileText = tfLink.getText().trim();
+
+        String fileText = viewModel.linkProperty().get();
+
         Optional<Path> file = FileHelper.expandFilename(stateManager.getActiveDatabase().get(), fileText,
                 Globals.prefs.getFileDirectoryPreferences());
 
@@ -73,7 +83,7 @@ void browseFileDialog(ActionEvent event) {
                     .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
             newFile = FileUtil.shortenFileName(newFile, fileDirectories);
 
-            tfLink.setText(newFile.toString());
+            viewModel.linkProperty().set(newFile.toString());
             tfLink.requestFocus();
         });
     }
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
index 1eb09b51706..1e23594dfcd 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
@@ -8,28 +8,30 @@
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 
 public class FileListDialogViewModel extends AbstractViewModel {
 
-    private final StringProperty linkProperty = new SimpleStringProperty();
-    private final StringProperty descriptionProperty = new SimpleStringProperty();
+    private final StringProperty linkProperty = new SimpleStringProperty("");
+    private final StringProperty descriptionProperty = new SimpleStringProperty("");
     private final ListProperty<ExternalFileType> externalfilesTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
 
     public FileListDialogViewModel() {
 
+        externalfilesTypes.set(FXCollections.observableArrayList(ExternalFileTypes.getInstance().getExternalFileTypeSelection()));
 
     }
     //
 
-    public StringProperty getLinkProperty() {
+    public StringProperty linkProperty() {
         return linkProperty;
     }
 
-    public StringProperty getDescriptionProperty() {
+    public StringProperty descriptionProperty() {
         return descriptionProperty;
     }
 
-    public ListProperty<ExternalFileType> getExternalfilesTypes() {
+    public ListProperty<ExternalFileType> externalFileTypeProperty() {
         return externalfilesTypes;
     }
 }
diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
index 4c8bc20c2ad..8d470ae078b 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
@@ -84,6 +84,9 @@ public class FileListEntryEditor {
     //Do not make this variable final, as then the lambda action listener will fail on compiöe
     private BibDatabaseContext databaseContext;
     private final ActionListener browsePressed = e -> {
+
+
+
         String fileText = link.getText().trim();
         Optional<Path> file = FileHelper.expandFilename(this.databaseContext, fileText,
                 Globals.prefs.getFileDirectoryPreferences());
diff --git a/src/main/resources/org/jabref/gui/filelist/SelectFilesDialog.fxml b/src/main/resources/org/jabref/gui/filelist/FileListDialog.fxml
similarity index 98%
rename from src/main/resources/org/jabref/gui/filelist/SelectFilesDialog.fxml
rename to src/main/resources/org/jabref/gui/filelist/FileListDialog.fxml
index 25c9238fe9b..25dc5b29804 100644
--- a/src/main/resources/org/jabref/gui/filelist/SelectFilesDialog.fxml
+++ b/src/main/resources/org/jabref/gui/filelist/FileListDialog.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<DialogPane prefHeight="100.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.FileLIstDialogController">
+<DialogPane prefHeight="100.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.FileListDialogController">
    <content>
       <VBox maxWidth="1.7976931348623157E308">
          <children>

From e099c2aa07fad9b6e91e059dc475c233187cade5 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 23 Sep 2017 20:44:00 +0200
Subject: [PATCH 06/36] port some more code

---
 .../jabref/gui/filelist/AttachFileAction.java |  4 +-
 .../filelist/FileListDialogController.java    | 56 ++++++++++++++++++-
 .../gui/filelist/FileListDialogViewModel.java |  8 ++-
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index 60b210cb4e8..be3f7690219 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -31,10 +31,10 @@ public void action() {
         /*   FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true,
                 panel.getBibDatabaseContext());
         editor.setVisible(true, true);
-        
+
         if (editor.okPressed()) {
             Optional<FieldChange> fieldChange = entry.addFile(flEntry);
-        
+
             if (fieldChange.isPresent()) {
                 UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE,
                         entry.getField(FieldName.FILE).orElse(null), fieldChange.get().getNewValue());
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
index e7308985862..5968b6fc046 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
@@ -1,12 +1,13 @@
 package org.jabref.gui.filelist;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
 import javax.inject.Inject;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -17,15 +18,24 @@
 import org.jabref.gui.AbstractController;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.externalfiletype.UnknownExternalFileType;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 public class FileListDialogController extends AbstractController<FileListDialogViewModel> {
 
+    private static final Log LOGGER = LogFactory.getLog(FileListDialogController.class);
+    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
 
     @FXML private TextField tfLink;
     @FXML private Button btnBrowse;
@@ -43,8 +53,9 @@ public class FileListDialogController extends AbstractController<FileListDialogV
 
     @FXML
     private void initialize() {
-        viewModel = new FileListDialogViewModel();
+        viewModel = new FileListDialogViewModel(stateManager.getActiveDatabase().get());
         setBindings();
+
     }
 
     private void setBindings() {
@@ -98,8 +109,49 @@ void ok_clicked(ActionEvent event) {
 
     }
 
+    private void setValues(LinkedFile entry) {
+        tfDescription.setText(entry.getDescription());
+        tfLink.setText(entry.getLink());
+
+        cmbFileType.getSelectionModel().clearSelection();
+        // See what is a reasonable selection for the type combobox:
+        Optional<ExternalFileType> fileType = ExternalFileTypes.getInstance().fromLinkedFile(entry, false);
+        if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
+            cmbFileType.getSelectionModel().select(fileType.get());
+        } else if ((entry.getLink() != null) && (!entry.getLink().isEmpty())) {
+            checkExtension();
+        }
+    }
+
+    private void checkExtension() {
+        if (cmbFileType.getSelectionModel().isEmpty() && (!tfLink.getText().trim().isEmpty())) {
+
+            // Check if this looks like a remote link:
+            if (REMOTE_LINK_PATTERN.matcher(tfLink.getText()).matches()) {
+                Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt("html");
+                if (type.isPresent()) {
+                    cmbFileType.getSelectionModel().select(type.get());
+                    return;
+                }
+            }
+
+            // Try to guess the file type:
+            String theLink = tfLink.getText().trim();
+            ExternalFileTypes.getInstance().getExternalFileTypeForName(theLink).ifPresent(type -> cmbFileType.getSelectionModel().select(type));
+        }
+
+    }
+
     @FXML
     void openFile(ActionEvent event) {
 
+        ExternalFileType type = cmbFileType.getSelectionModel().getSelectedItem();
+        if (type != null) {
+            try {
+                JabRefDesktop.openExternalFileAnyFormat(stateManager.getActiveDatabase().get(), viewModel.linkProperty().get(), Optional.of(type));
+            } catch (IOException e) {
+                LOGGER.error("File could not be opened", e);
+            }
+        }
     }
 }
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
index 1e23594dfcd..8d8e4dd885b 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
@@ -9,20 +9,25 @@
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.model.database.BibDatabaseContext;
 
 public class FileListDialogViewModel extends AbstractViewModel {
 
     private final StringProperty linkProperty = new SimpleStringProperty("");
     private final StringProperty descriptionProperty = new SimpleStringProperty("");
     private final ListProperty<ExternalFileType> externalfilesTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
+    private final BibDatabaseContext bibDatabaseContext;
 
-    public FileListDialogViewModel() {
+    public FileListDialogViewModel(BibDatabaseContext bibDatabaseContext) {
 
+        this.bibDatabaseContext = bibDatabaseContext;
         externalfilesTypes.set(FXCollections.observableArrayList(ExternalFileTypes.getInstance().getExternalFileTypeSelection()));
 
+
     }
     //
 
+
     public StringProperty linkProperty() {
         return linkProperty;
     }
@@ -34,4 +39,5 @@ public StringProperty descriptionProperty() {
     public ListProperty<ExternalFileType> externalFileTypeProperty() {
         return externalfilesTypes;
     }
+
 }

From 982b47574ebdff862984d0911818aef0b0efe517 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Wed, 1 Nov 2017 17:09:20 +0100
Subject: [PATCH 07/36] Asssign combobox selected value property

---
 .../filelist/FileListDialogController.java    | 81 ++---------------
 .../gui/filelist/FileListDialogViewModel.java | 87 ++++++++++++++++++-
 2 files changed, 92 insertions(+), 76 deletions(-)

diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
index 5968b6fc046..b1aabfed651 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
@@ -1,32 +1,19 @@
 package org.jabref.gui.filelist;
 
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
 import java.util.Optional;
-import java.util.regex.Pattern;
-
 import javax.inject.Inject;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
-
-import org.jabref.Globals;
 import org.jabref.gui.AbstractController;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.util.FileHelper;
-import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.apache.commons.logging.Log;
@@ -35,7 +22,6 @@
 public class FileListDialogController extends AbstractController<FileListDialogViewModel> {
 
     private static final Log LOGGER = LogFactory.getLog(FileListDialogController.class);
-    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
 
     @FXML private TextField tfLink;
     @FXML private Button btnBrowse;
@@ -49,11 +35,9 @@ public class FileListDialogController extends AbstractController<FileListDialogV
     @Inject private DialogService dialogService;
     @Inject private StateManager stateManager;
 
-    private boolean showSaveDialog;
-
     @FXML
     private void initialize() {
-        viewModel = new FileListDialogViewModel(stateManager.getActiveDatabase().get());
+        viewModel = new FileListDialogViewModel(stateManager.getActiveDatabase().get(), dialogService);
         setBindings();
 
     }
@@ -63,40 +47,16 @@ private void setBindings() {
         cmbFileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
         tfDescription.textProperty().bindBidirectional(viewModel.descriptionProperty());
         tfLink.textProperty().bindBidirectional(viewModel.linkProperty());
+
+        cmbFileType.valueProperty().bindBidirectional(viewModel.getSelectedExternalFileType());
     }
 
     @FXML
     void browseFileDialog(ActionEvent event) {
 
-        String fileText = viewModel.linkProperty().get();
+        viewModel.browseFileDialog();
+        tfLink.requestFocus();
 
-        Optional<Path> file = FileHelper.expandFilename(stateManager.getActiveDatabase().get(), fileText,
-                Globals.prefs.getFileDirectoryPreferences());
-
-        Path workingDir = file.orElse(Paths.get(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)));
-        String fileName = Paths.get(fileText).getFileName().toString();
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(workingDir)
-                .withInitialFileName(fileName).build();
-        Optional<Path> path;
-        if (showSaveDialog) {
-            path = dialogService.showFileSaveDialog(fileDialogConfiguration);
-        } else {
-            path = dialogService.showFileOpenDialog(fileDialogConfiguration);
-        }
-        path.ifPresent(newFile -> {
-            // Store the directory for next time:
-            Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, newFile.toString());
-
-            // If the file is below the file directory, make the path relative:
-            List<Path> fileDirectories = this.stateManager.getActiveDatabase().get()
-                    .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
-            newFile = FileUtil.shortenFileName(newFile, fileDirectories);
-
-            viewModel.linkProperty().set(newFile.toString());
-            tfLink.requestFocus();
-        });
     }
 
     @FXML
@@ -110,36 +70,7 @@ void ok_clicked(ActionEvent event) {
     }
 
     private void setValues(LinkedFile entry) {
-        tfDescription.setText(entry.getDescription());
-        tfLink.setText(entry.getLink());
-
-        cmbFileType.getSelectionModel().clearSelection();
-        // See what is a reasonable selection for the type combobox:
-        Optional<ExternalFileType> fileType = ExternalFileTypes.getInstance().fromLinkedFile(entry, false);
-        if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
-            cmbFileType.getSelectionModel().select(fileType.get());
-        } else if ((entry.getLink() != null) && (!entry.getLink().isEmpty())) {
-            checkExtension();
-        }
-    }
-
-    private void checkExtension() {
-        if (cmbFileType.getSelectionModel().isEmpty() && (!tfLink.getText().trim().isEmpty())) {
-
-            // Check if this looks like a remote link:
-            if (REMOTE_LINK_PATTERN.matcher(tfLink.getText()).matches()) {
-                Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt("html");
-                if (type.isPresent()) {
-                    cmbFileType.getSelectionModel().select(type.get());
-                    return;
-                }
-            }
-
-            // Try to guess the file type:
-            String theLink = tfLink.getText().trim();
-            ExternalFileTypes.getInstance().getExternalFileTypeForName(theLink).ifPresent(type -> cmbFileType.getSelectionModel().select(type));
-        }
-
+        viewModel.setValues(entry);
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
index 8d8e4dd885b..bdb2758bfc5 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
@@ -1,32 +1,114 @@
 package org.jabref.gui.filelist;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
 import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
+import org.jabref.Globals;
 import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.externalfiletype.UnknownExternalFileType;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.util.FileHelper;
+import org.jabref.preferences.JabRefPreferences;
 
 public class FileListDialogViewModel extends AbstractViewModel {
 
+    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
     private final StringProperty linkProperty = new SimpleStringProperty("");
     private final StringProperty descriptionProperty = new SimpleStringProperty("");
     private final ListProperty<ExternalFileType> externalfilesTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
+    private final ObjectProperty<ExternalFileType> selectedExternalFileType = new SimpleObjectProperty<>();
     private final BibDatabaseContext bibDatabaseContext;
+    private final DialogService dialogService;
+
+    private boolean showSaveDialog;
 
-    public FileListDialogViewModel(BibDatabaseContext bibDatabaseContext) {
+    public FileListDialogViewModel(BibDatabaseContext bibDatabaseContext, DialogService dialogService) {
 
         this.bibDatabaseContext = bibDatabaseContext;
+        this.dialogService = dialogService;
         externalfilesTypes.set(FXCollections.observableArrayList(ExternalFileTypes.getInstance().getExternalFileTypeSelection()));
+    }
+
+    private void checkExtension() {
+
+        if (!linkProperty.getValueSafe().isEmpty()) {
 
+            // Check if this looks like a remote link:
+            if (REMOTE_LINK_PATTERN.matcher(linkProperty.get()).matches()) {
+                ExternalFileTypes.getInstance().getExternalFileTypeByExt("html").ifPresent(selectedExternalFileType::setValue);
+            }
 
+            // Try to guess the file type:
+            String theLink = linkProperty.get().trim();
+            ExternalFileTypes.getInstance().getExternalFileTypeForName(theLink).ifPresent(selectedExternalFileType::setValue);
+        }
     }
+
+    public void browseFileDialog() {
+        String fileText = linkProperty().get();
+
+        Optional<Path> file = FileHelper.expandFilename(bibDatabaseContext, fileText,
+                Globals.prefs.getFileDirectoryPreferences());
+
+        Path workingDir = file.orElse(Paths.get(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)));
+        String fileName = Paths.get(fileText).getFileName().toString();
+
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .withInitialDirectory(workingDir)
+                .withInitialFileName(fileName).build();
+        Optional<Path> path;
+
+        if (showSaveDialog) {
+            path = dialogService.showFileSaveDialog(fileDialogConfiguration);
+        } else {
+            path = dialogService.showFileOpenDialog(fileDialogConfiguration);
+        }
+        path.ifPresent(newFile -> {
+            // Store the directory for next time:
+            Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, newFile.toString());
+
+            // If the file is below the file directory, make the path relative:
+            List<Path> fileDirectories = bibDatabaseContext
+                    .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+            newFile = FileUtil.shortenFileName(newFile, fileDirectories);
+
+            linkProperty().set(newFile.toString());
+            checkExtension();
+        });
+    }
+
     //
+    public void setValues(LinkedFile entry) {
+        descriptionProperty.set(entry.getDescription());
+        linkProperty.set(entry.getLink());
+
+        selectedExternalFileType.setValue(null);
 
+        // See what is a reasonable selection for the type combobox:
+        Optional<ExternalFileType> fileType = ExternalFileTypes.getInstance().fromLinkedFile(entry, false);
+        if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
+            selectedExternalFileType.setValue(fileType.get());
+        } else if ((entry.getLink() != null) && (!entry.getLink().isEmpty())) {
+            checkExtension();
+        }
+    }
 
     public StringProperty linkProperty() {
         return linkProperty;
@@ -40,4 +122,7 @@ public ListProperty<ExternalFileType> externalFileTypeProperty() {
         return externalfilesTypes;
     }
 
+    public ObjectProperty<ExternalFileType> getSelectedExternalFileType() {
+        return selectedExternalFileType;
+    }
 }

From 9f5036d627a8ffb25d121ca2e450d9ac359aa5ec Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 19 Nov 2017 16:58:37 +0100
Subject: [PATCH 08/36] fix some formatting

---
 .../jabref/gui/filelist/FileListDialogController.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
index b1aabfed651..8acca4ee82e 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
@@ -2,12 +2,15 @@
 
 import java.io.IOException;
 import java.util.Optional;
+
 import javax.inject.Inject;
+
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
+
 import org.jabref.gui.AbstractController;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -52,20 +55,19 @@ private void setBindings() {
     }
 
     @FXML
-    void browseFileDialog(ActionEvent event) {
-
+    private void browseFileDialog(ActionEvent event) {
         viewModel.browseFileDialog();
         tfLink.requestFocus();
 
     }
 
     @FXML
-    void cancel(ActionEvent event) {
+    private void cancel(ActionEvent event) {
         getStage().close();
     }
 
     @FXML
-    void ok_clicked(ActionEvent event) {
+    private void ok_clicked(ActionEvent event) {
 
     }
 

From 81c25ec23b44d47d83cdf4736b5c919bcaa3df36 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 29 Dec 2017 15:42:18 +0100
Subject: [PATCH 09/36] make getController public to get viewModel

---
 src/main/java/org/jabref/gui/AbstractView.java         |  4 ++--
 .../java/org/jabref/gui/filelist/AttachFileAction.java |  7 ++++++-
 .../jabref/gui/filelist/FileListDialogController.java  | 10 ++--------
 .../org/jabref/gui/filelist/FileListDialogView.java    |  8 ++++++++
 .../jabref/gui/filelist/FileListDialogViewModel.java   | 10 ++++++++++
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jabref/gui/AbstractView.java b/src/main/java/org/jabref/gui/AbstractView.java
index 055d5a69d0e..56baefe919b 100644
--- a/src/main/java/org/jabref/gui/AbstractView.java
+++ b/src/main/java/org/jabref/gui/AbstractView.java
@@ -32,7 +32,7 @@ public Parent getView() {
 
         // Notify controller about the stage, where it is displayed
         view.sceneProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue != null && newValue.getWindow() instanceof Stage) {
+            if ((newValue != null) && (newValue.getWindow() instanceof Stage)) {
                 Stage stage = (Stage) newValue.getWindow();
                 if (stage != null) {
                     getController().ifPresent(controller -> controller.setStage(stage));
@@ -42,7 +42,7 @@ public Parent getView() {
         return view;
     }
 
-    private Optional<AbstractController> getController() {
+    public Optional<AbstractController> getController() {
         return Optional.ofNullable(presenterProperty.get()).map(
                 presenter -> (AbstractController) presenter);
     }
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index be3f7690219..2f9077ac7c0 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -27,7 +27,12 @@ public void action() {
 
         FileListDialogView dlg = new FileListDialogView();
 
-        Platform.runLater(() -> dlg.show());
+        Platform.runLater(() -> {
+            dlg.show();
+
+        });
+        //
+
         /*   FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true,
                 panel.getBibDatabaseContext());
         editor.setVisible(true, true);
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
index 8acca4ee82e..4805eabcb1f 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
@@ -17,14 +17,13 @@
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.PreferencesService;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class FileListDialogController extends AbstractController<FileListDialogViewModel> {
 
     private static final Log LOGGER = LogFactory.getLog(FileListDialogController.class);
+    private boolean okPressed;
 
     @FXML private TextField tfLink;
     @FXML private Button btnBrowse;
@@ -34,7 +33,6 @@ public class FileListDialogController extends AbstractController<FileListDialogV
     @FXML private Button btnOk;
     @FXML private Button btnCancel;
 
-    @Inject private PreferencesService preferences;
     @Inject private DialogService dialogService;
     @Inject private StateManager stateManager;
 
@@ -42,15 +40,12 @@ public class FileListDialogController extends AbstractController<FileListDialogV
     private void initialize() {
         viewModel = new FileListDialogViewModel(stateManager.getActiveDatabase().get(), dialogService);
         setBindings();
-
     }
 
     private void setBindings() {
-
         cmbFileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
         tfDescription.textProperty().bindBidirectional(viewModel.descriptionProperty());
         tfLink.textProperty().bindBidirectional(viewModel.linkProperty());
-
         cmbFileType.valueProperty().bindBidirectional(viewModel.getSelectedExternalFileType());
     }
 
@@ -58,7 +53,6 @@ private void setBindings() {
     private void browseFileDialog(ActionEvent event) {
         viewModel.browseFileDialog();
         tfLink.requestFocus();
-
     }
 
     @FXML
@@ -68,7 +62,7 @@ private void cancel(ActionEvent event) {
 
     @FXML
     private void ok_clicked(ActionEvent event) {
-
+        viewModel.setOkPressed();
     }
 
     private void setValues(LinkedFile entry) {
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogView.java b/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
index 49ca84d1eb4..7d07b28af8b 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.filelist;
 
 import javafx.scene.control.Alert.AlertType;
+
 import javafx.scene.control.DialogPane;
 
 import org.jabref.gui.AbstractDialogView;
@@ -16,4 +17,11 @@ public void show() {
         filelistDialog.show();
 
     }
+
+    public boolean okPressed() {
+        FileListDialogViewModel viewModel = (FileListDialogViewModel) this.getController().get().getViewModel();
+
+        return false;
+    }
+
 }
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
index bdb2758bfc5..af408ef251d 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
@@ -39,6 +39,16 @@ public class FileListDialogViewModel extends AbstractViewModel {
 
     private boolean showSaveDialog;
 
+    private boolean okPressed;
+
+    public boolean isOkPressed() {
+        return okPressed;
+    }
+
+    public void setOkPressed() {
+        okPressed = true;
+    }
+
     public FileListDialogViewModel(BibDatabaseContext bibDatabaseContext, DialogService dialogService) {
 
         this.bibDatabaseContext = bibDatabaseContext;

From e326bcf7b8fd26c03b73cc9048454ec71ef93ffe Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Wed, 3 Jan 2018 11:04:18 +0100
Subject: [PATCH 10/36] add enum with config values instead of booleans

---
 .../jabref/gui/filelist/AttachFileAction.java |  2 +-
 .../filelist/FileListDialogController.java    |  5 ++++
 .../gui/filelist/FileListDialogOptions.java   | 10 ++++++++
 .../gui/filelist/FileListDialogView.java      | 25 ++++++++++++++++---
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/filelist/FileListDialogOptions.java

diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index 2f9077ac7c0..b21371c1e3a 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -25,7 +25,7 @@ public void action() {
         BibEntry entry = panel.getSelectedEntries().get(0);
         LinkedFile flEntry = new LinkedFile("", "", "");
 
-        FileListDialogView dlg = new FileListDialogView();
+        FileListDialogView dlg = new FileListDialogView(FileListDialogOptions.SHOW_OPEN_BUTTON);
 
         Platform.runLater(() -> {
             dlg.show();
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
index 4805eabcb1f..6f6b9f42135 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.filelist;
 
 import java.io.IOException;
+import java.util.EnumSet;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -35,11 +36,15 @@ public class FileListDialogController extends AbstractController<FileListDialogV
 
     @Inject private DialogService dialogService;
     @Inject private StateManager stateManager;
+    @Inject private EnumSet<FileListDialogOptions> dialogoptions;
 
     @FXML
     private void initialize() {
         viewModel = new FileListDialogViewModel(stateManager.getActiveDatabase().get(), dialogService);
         setBindings();
+
+        System.out.println(dialogoptions);
+
     }
 
     private void setBindings() {
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogOptions.java b/src/main/java/org/jabref/gui/filelist/FileListDialogOptions.java
new file mode 100644
index 00000000000..d6aa569e794
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogOptions.java
@@ -0,0 +1,10 @@
+package org.jabref.gui.filelist;
+
+
+public enum FileListDialogOptions {
+
+    SHOW_DIALOG,
+    SHOW_PROGESSBAR,
+    SHOW_OPEN_BUTTON,
+    SHOW_SAVE_BUTTON;
+}
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogView.java b/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
index 7d07b28af8b..c49b2ad40fa 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
@@ -2,6 +2,12 @@
 
 import javafx.scene.control.Alert.AlertType;
 
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
 import javafx.scene.control.DialogPane;
 
 import org.jabref.gui.AbstractDialogView;
@@ -9,9 +15,13 @@
 
 public class FileListDialogView extends AbstractDialogView {
 
+    public FileListDialogView(FileListDialogOptions... options) {
+        super(createContext(options));
+    }
+
     @Override
     public void show() {
-        FXDialog filelistDialog = new FXDialog(AlertType.INFORMATION, "FileLIstDialog ");
+        FXDialog filelistDialog = new FXDialog(AlertType.INFORMATION, "FileListDialog ");
         filelistDialog.setDialogPane((DialogPane) this.getView());
         filelistDialog.setResizable(true);
         filelistDialog.show();
@@ -20,8 +30,17 @@ public void show() {
 
     public boolean okPressed() {
         FileListDialogViewModel viewModel = (FileListDialogViewModel) this.getController().get().getViewModel();
-
-        return false;
+        return viewModel.isOkPressed();
     }
 
+    private static Function<String, Object> createContext(FileListDialogOptions... options) {
+        Map<String, Object> context = new HashMap<>();
+
+        EnumSet<FileListDialogOptions> opt = EnumSet.noneOf(FileListDialogOptions.class);
+        opt.addAll(Arrays.asList(options));
+        //The "keys" of the HashMap must have the same name as the with @inject annotated field in the controller
+        context.put("dialogoptions", opt);
+
+        return context::get;
+    }
 }

From 32c3db2ec594808d5ff82eb8658cbc747679292b Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 14 Jan 2018 19:33:20 +0100
Subject: [PATCH 11/36] Fix depdendency injection

---
 .../filelist/FileListDialogController.java    | 14 +++++++---
 .../FileListDialogOptionDependency.java       | 27 +++++++++++++++++++
 .../gui/filelist/FileListDialogView.java      | 20 ++++++++++----
 .../gui/filelist/FileListDialogViewModel.java | 10 +++----
 4 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/filelist/FileListDialogOptionDependency.java

diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
index 6f6b9f42135..ed062858c05 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.filelist;
 
 import java.io.IOException;
-import java.util.EnumSet;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -18,6 +17,7 @@
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.model.entry.LinkedFile;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -36,15 +36,21 @@ public class FileListDialogController extends AbstractController<FileListDialogV
 
     @Inject private DialogService dialogService;
     @Inject private StateManager stateManager;
-    @Inject private EnumSet<FileListDialogOptions> dialogoptions;
+    @Inject private FileListDialogOptionDependency dependency;
 
     @FXML
     private void initialize() {
-        viewModel = new FileListDialogViewModel(stateManager.getActiveDatabase().get(), dialogService);
+        viewModel = new FileListDialogViewModel(stateManager.getActiveDatabase().get(), dialogService, dependency.getDialogOptions());
         setBindings();
 
-        System.out.println(dialogoptions);
+        //TODO: is a bit too early I think
+        /*     this.getStage().getScene().addEventHandler(WindowEvent.WINDOW_SHOWING, event -> {
+
+            System.out.println("Window showing event");
 
+        });
+        System.out.println(dependency.getDialogOptions());
+        */
     }
 
     private void setBindings() {
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogOptionDependency.java b/src/main/java/org/jabref/gui/filelist/FileListDialogOptionDependency.java
new file mode 100644
index 00000000000..d3d7be4a7a6
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogOptionDependency.java
@@ -0,0 +1,27 @@
+package org.jabref.gui.filelist;
+
+import java.util.EnumSet;
+
+public class FileListDialogOptionDependency {
+
+
+
+    private EnumSet<FileListDialogOptions> dialogOptions = EnumSet.noneOf(FileListDialogOptions.class);
+
+    public void setDialogOptions(EnumSet<FileListDialogOptions> dialogOptions) {
+        this.dialogOptions = dialogOptions;
+    }
+
+    public FileListDialogOptionDependency() {
+        //empty, workaround for injection
+    }
+
+    public EnumSet<FileListDialogOptions> getDialogOptions() {
+        return dialogOptions;
+    }
+
+    @Override
+    public String toString() {
+        return "FileListDialogOptionDependency [dialogOptions=" + dialogOptions + "]";
+    }
+}
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogView.java b/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
index c49b2ad40fa..0a65b34c4cc 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
@@ -16,7 +16,11 @@
 public class FileListDialogView extends AbstractDialogView {
 
     public FileListDialogView(FileListDialogOptions... options) {
-        super(createContext(options));
+        this(getDeps(options));
+    }
+
+    public FileListDialogView(FileListDialogOptionDependency deps) {
+        super(createContext(deps));
     }
 
     @Override
@@ -33,14 +37,20 @@ public boolean okPressed() {
         return viewModel.isOkPressed();
     }
 
-    private static Function<String, Object> createContext(FileListDialogOptions... options) {
+    private static Function<String, Object> createContext(FileListDialogOptionDependency dependency) {
         Map<String, Object> context = new HashMap<>();
 
-        EnumSet<FileListDialogOptions> opt = EnumSet.noneOf(FileListDialogOptions.class);
-        opt.addAll(Arrays.asList(options));
         //The "keys" of the HashMap must have the same name as the with @inject annotated field in the controller
-        context.put("dialogoptions", opt);
+        context.put("dependency", dependency);
 
         return context::get;
     }
+
+    private static FileListDialogOptionDependency getDeps(FileListDialogOptions... options) {
+        EnumSet<FileListDialogOptions> set = EnumSet.noneOf(FileListDialogOptions.class);
+        set.addAll(Arrays.asList(options));
+        FileListDialogOptionDependency deps = new FileListDialogOptionDependency();
+        deps.setDialogOptions(set);
+        return deps;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
index af408ef251d..e5a2bf7f1b9 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
@@ -2,6 +2,7 @@
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.regex.Pattern;
@@ -37,9 +38,8 @@ public class FileListDialogViewModel extends AbstractViewModel {
     private final BibDatabaseContext bibDatabaseContext;
     private final DialogService dialogService;
 
-    private boolean showSaveDialog;
-
     private boolean okPressed;
+    private final EnumSet<FileListDialogOptions> dialogOptions;
 
     public boolean isOkPressed() {
         return okPressed;
@@ -49,8 +49,8 @@ public void setOkPressed() {
         okPressed = true;
     }
 
-    public FileListDialogViewModel(BibDatabaseContext bibDatabaseContext, DialogService dialogService) {
-
+    public FileListDialogViewModel(BibDatabaseContext bibDatabaseContext, DialogService dialogService, EnumSet<FileListDialogOptions> dialogOptions) {
+        this.dialogOptions = dialogOptions;
         this.bibDatabaseContext = bibDatabaseContext;
         this.dialogService = dialogService;
         externalfilesTypes.set(FXCollections.observableArrayList(ExternalFileTypes.getInstance().getExternalFileTypeSelection()));
@@ -85,7 +85,7 @@ public void browseFileDialog() {
                 .withInitialFileName(fileName).build();
         Optional<Path> path;
 
-        if (showSaveDialog) {
+        if (dialogOptions.contains(FileListDialogOptions.SHOW_SAVE_BUTTON)) {
             path = dialogService.showFileSaveDialog(fileDialogConfiguration);
         } else {
             path = dialogService.showFileOpenDialog(fileDialogConfiguration);

From 514cd491e8ce27d7ad4e65d2eeaddef837e5f897 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 6 Feb 2018 21:09:42 +0100
Subject: [PATCH 12/36] Rework

---
 .../jabref/gui/AbstractReturnDialogView.java  | 19 ++++
 .../jabref/gui/filelist/AttachFileAction.java | 13 +--
 .../filelist/FileListDialogController.java    | 95 -------------------
 .../FileListDialogOptionDependency.java       | 27 ------
 .../gui/filelist/FileListDialogOptions.java   | 10 --
 .../gui/filelist/FileListDialogView.java      | 56 -----------
 .../gui/filelist/FileListDialogViewModel.java | 42 +++-----
 .../gui/filelist/LinkedFileEditDialog.fxml    | 49 ++++++++++
 .../LinkedFileEditDialogController.java       | 45 +++++++++
 .../filelist/LinkedFileEditDialogView.java    | 41 ++++++++
 .../jabref/gui/filelist/FileListDialog.fxml   | 68 -------------
 11 files changed, 171 insertions(+), 294 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/AbstractReturnDialogView.java
 delete mode 100644 src/main/java/org/jabref/gui/filelist/FileListDialogController.java
 delete mode 100644 src/main/java/org/jabref/gui/filelist/FileListDialogOptionDependency.java
 delete mode 100644 src/main/java/org/jabref/gui/filelist/FileListDialogOptions.java
 delete mode 100644 src/main/java/org/jabref/gui/filelist/FileListDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
 create mode 100644 src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
 delete mode 100644 src/main/resources/org/jabref/gui/filelist/FileListDialog.fxml

diff --git a/src/main/java/org/jabref/gui/AbstractReturnDialogView.java b/src/main/java/org/jabref/gui/AbstractReturnDialogView.java
new file mode 100644
index 00000000000..0386af11db7
--- /dev/null
+++ b/src/main/java/org/jabref/gui/AbstractReturnDialogView.java
@@ -0,0 +1,19 @@
+package org.jabref.gui;
+
+import java.util.function.Function;
+
+/**
+ * Dialog which returns a result of type {@link T}.
+ */
+public abstract class AbstractReturnDialogView<T> extends AbstractView {
+
+    public AbstractReturnDialogView() {
+        super();
+    }
+
+    public AbstractReturnDialogView(Function<String, Object> injectionContext) {
+        super(injectionContext);
+    }
+
+    public abstract T showAndWait();
+}
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index b21371c1e3a..1f5e634f144 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -1,9 +1,8 @@
 package org.jabref.gui.filelist;
 
-import javafx.application.Platform;
-
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.actions.BaseAction;
+import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -23,14 +22,10 @@ public void action() {
             return;
         }
         BibEntry entry = panel.getSelectedEntries().get(0);
-        LinkedFile flEntry = new LinkedFile("", "", "");
-
-        FileListDialogView dlg = new FileListDialogView(FileListDialogOptions.SHOW_OPEN_BUTTON);
-
-        Platform.runLater(() -> {
-            dlg.show();
+        LinkedFile linkedFile = new LinkedFile("", "", "");
+        LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
 
-        });
+        DefaultTaskExecutor.runInJavaFXThread((Runnable) dialog::showAndWait);
         //
 
         /*   FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true,
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java b/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
deleted file mode 100644
index ed062858c05..00000000000
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogController.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.jabref.gui.filelist;
-
-import java.io.IOException;
-import java.util.Optional;
-
-import javax.inject.Inject;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.TextField;
-
-import org.jabref.gui.AbstractController;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
-import org.jabref.gui.desktop.JabRefDesktop;
-import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.model.entry.LinkedFile;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class FileListDialogController extends AbstractController<FileListDialogViewModel> {
-
-    private static final Log LOGGER = LogFactory.getLog(FileListDialogController.class);
-    private boolean okPressed;
-
-    @FXML private TextField tfLink;
-    @FXML private Button btnBrowse;
-    @FXML private Button btnOpen;
-    @FXML private TextField tfDescription;
-    @FXML private ComboBox<ExternalFileType> cmbFileType;
-    @FXML private Button btnOk;
-    @FXML private Button btnCancel;
-
-    @Inject private DialogService dialogService;
-    @Inject private StateManager stateManager;
-    @Inject private FileListDialogOptionDependency dependency;
-
-    @FXML
-    private void initialize() {
-        viewModel = new FileListDialogViewModel(stateManager.getActiveDatabase().get(), dialogService, dependency.getDialogOptions());
-        setBindings();
-
-        //TODO: is a bit too early I think
-        /*     this.getStage().getScene().addEventHandler(WindowEvent.WINDOW_SHOWING, event -> {
-
-            System.out.println("Window showing event");
-
-        });
-        System.out.println(dependency.getDialogOptions());
-        */
-    }
-
-    private void setBindings() {
-        cmbFileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
-        tfDescription.textProperty().bindBidirectional(viewModel.descriptionProperty());
-        tfLink.textProperty().bindBidirectional(viewModel.linkProperty());
-        cmbFileType.valueProperty().bindBidirectional(viewModel.getSelectedExternalFileType());
-    }
-
-    @FXML
-    private void browseFileDialog(ActionEvent event) {
-        viewModel.browseFileDialog();
-        tfLink.requestFocus();
-    }
-
-    @FXML
-    private void cancel(ActionEvent event) {
-        getStage().close();
-    }
-
-    @FXML
-    private void ok_clicked(ActionEvent event) {
-        viewModel.setOkPressed();
-    }
-
-    private void setValues(LinkedFile entry) {
-        viewModel.setValues(entry);
-    }
-
-    @FXML
-    void openFile(ActionEvent event) {
-
-        ExternalFileType type = cmbFileType.getSelectionModel().getSelectedItem();
-        if (type != null) {
-            try {
-                JabRefDesktop.openExternalFileAnyFormat(stateManager.getActiveDatabase().get(), viewModel.linkProperty().get(), Optional.of(type));
-            } catch (IOException e) {
-                LOGGER.error("File could not be opened", e);
-            }
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogOptionDependency.java b/src/main/java/org/jabref/gui/filelist/FileListDialogOptionDependency.java
deleted file mode 100644
index d3d7be4a7a6..00000000000
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogOptionDependency.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.jabref.gui.filelist;
-
-import java.util.EnumSet;
-
-public class FileListDialogOptionDependency {
-
-
-
-    private EnumSet<FileListDialogOptions> dialogOptions = EnumSet.noneOf(FileListDialogOptions.class);
-
-    public void setDialogOptions(EnumSet<FileListDialogOptions> dialogOptions) {
-        this.dialogOptions = dialogOptions;
-    }
-
-    public FileListDialogOptionDependency() {
-        //empty, workaround for injection
-    }
-
-    public EnumSet<FileListDialogOptions> getDialogOptions() {
-        return dialogOptions;
-    }
-
-    @Override
-    public String toString() {
-        return "FileListDialogOptionDependency [dialogOptions=" + dialogOptions + "]";
-    }
-}
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogOptions.java b/src/main/java/org/jabref/gui/filelist/FileListDialogOptions.java
deleted file mode 100644
index d6aa569e794..00000000000
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogOptions.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.jabref.gui.filelist;
-
-
-public enum FileListDialogOptions {
-
-    SHOW_DIALOG,
-    SHOW_PROGESSBAR,
-    SHOW_OPEN_BUTTON,
-    SHOW_SAVE_BUTTON;
-}
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogView.java b/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
deleted file mode 100644
index 0a65b34c4cc..00000000000
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogView.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.jabref.gui.filelist;
-
-import javafx.scene.control.Alert.AlertType;
-
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
-import javafx.scene.control.DialogPane;
-
-import org.jabref.gui.AbstractDialogView;
-import org.jabref.gui.FXDialog;
-
-public class FileListDialogView extends AbstractDialogView {
-
-    public FileListDialogView(FileListDialogOptions... options) {
-        this(getDeps(options));
-    }
-
-    public FileListDialogView(FileListDialogOptionDependency deps) {
-        super(createContext(deps));
-    }
-
-    @Override
-    public void show() {
-        FXDialog filelistDialog = new FXDialog(AlertType.INFORMATION, "FileListDialog ");
-        filelistDialog.setDialogPane((DialogPane) this.getView());
-        filelistDialog.setResizable(true);
-        filelistDialog.show();
-
-    }
-
-    public boolean okPressed() {
-        FileListDialogViewModel viewModel = (FileListDialogViewModel) this.getController().get().getViewModel();
-        return viewModel.isOkPressed();
-    }
-
-    private static Function<String, Object> createContext(FileListDialogOptionDependency dependency) {
-        Map<String, Object> context = new HashMap<>();
-
-        //The "keys" of the HashMap must have the same name as the with @inject annotated field in the controller
-        context.put("dependency", dependency);
-
-        return context::get;
-    }
-
-    private static FileListDialogOptionDependency getDeps(FileListDialogOptions... options) {
-        EnumSet<FileListDialogOptions> set = EnumSet.noneOf(FileListDialogOptions.class);
-        set.addAll(Arrays.asList(options));
-        FileListDialogOptionDependency deps = new FileListDialogOptionDependency();
-        deps.setDialogOptions(set);
-        return deps;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
index e5a2bf7f1b9..8ce9c6e864c 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
@@ -2,7 +2,6 @@
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.regex.Pattern;
@@ -35,23 +34,14 @@ public class FileListDialogViewModel extends AbstractViewModel {
     private final StringProperty descriptionProperty = new SimpleStringProperty("");
     private final ListProperty<ExternalFileType> externalfilesTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
     private final ObjectProperty<ExternalFileType> selectedExternalFileType = new SimpleObjectProperty<>();
-    private final BibDatabaseContext bibDatabaseContext;
+    private final BibDatabaseContext database;
     private final DialogService dialogService;
 
-    private boolean okPressed;
-    private final EnumSet<FileListDialogOptions> dialogOptions;
+    private final LinkedFile linkedFile;
 
-    public boolean isOkPressed() {
-        return okPressed;
-    }
-
-    public void setOkPressed() {
-        okPressed = true;
-    }
-
-    public FileListDialogViewModel(BibDatabaseContext bibDatabaseContext, DialogService dialogService, EnumSet<FileListDialogOptions> dialogOptions) {
-        this.dialogOptions = dialogOptions;
-        this.bibDatabaseContext = bibDatabaseContext;
+    public FileListDialogViewModel(LinkedFile linkedFile, BibDatabaseContext database, DialogService dialogService) {
+        this.linkedFile = linkedFile;
+        this.database = database;
         this.dialogService = dialogService;
         externalfilesTypes.set(FXCollections.observableArrayList(ExternalFileTypes.getInstance().getExternalFileTypeSelection()));
     }
@@ -71,10 +61,10 @@ private void checkExtension() {
         }
     }
 
-    public void browseFileDialog() {
+    public void openBrowseDialog() {
         String fileText = linkProperty().get();
 
-        Optional<Path> file = FileHelper.expandFilename(bibDatabaseContext, fileText,
+        Optional<Path> file = FileHelper.expandFilename(database, fileText,
                 Globals.prefs.getFileDirectoryPreferences());
 
         Path workingDir = file.orElse(Paths.get(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)));
@@ -83,23 +73,17 @@ public void browseFileDialog() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .withInitialDirectory(workingDir)
                 .withInitialFileName(fileName).build();
-        Optional<Path> path;
-
-        if (dialogOptions.contains(FileListDialogOptions.SHOW_SAVE_BUTTON)) {
-            path = dialogService.showFileSaveDialog(fileDialogConfiguration);
-        } else {
-            path = dialogService.showFileOpenDialog(fileDialogConfiguration);
-        }
-        path.ifPresent(newFile -> {
+        dialogService.showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(path -> {
             // Store the directory for next time:
-            Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, newFile.toString());
+                    Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, path.toString());
 
             // If the file is below the file directory, make the path relative:
-            List<Path> fileDirectories = bibDatabaseContext
+                    List<Path> fileDirectories = database
                     .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
-            newFile = FileUtil.shortenFileName(newFile, fileDirectories);
+                    path = FileUtil.shortenFileName(path, fileDirectories);
 
-            linkProperty().set(newFile.toString());
+                    linkProperty().set(path.toString());
             checkExtension();
         });
     }
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
new file mode 100644
index 00000000000..dcd13f30226
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="100.0" xmlns="http://javafx.com/javafx/8.0.111"
+            fx:controller="org.jabref.gui.filelist.LinkedFileEditDialogController">
+   <content>
+       <VBox maxWidth="1.7976931348623157E308">
+           <HBox prefHeight="100.0" spacing="10.0">
+               <padding>
+                   <Insets top="10.0"/>
+               </padding>
+               <Label maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="95.0" text="%Link">
+                   <padding>
+                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                   </padding>
+               </Label>
+               <TextField fx:id="link" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity"/>
+               <Button minWidth="-Infinity" mnemonicParsing="false" onAction="#openBrowseDialog" text="%Browse"/>
+           </HBox>
+           <HBox layoutX="21.0" layoutY="21.0" prefHeight="100.0" spacing="10.0">
+               <Label minWidth="95.0" text="Description">
+                   <HBox.margin>
+                       <Insets/>
+                   </HBox.margin>
+                   <padding>
+                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                   </padding>
+               </Label>
+               <TextField fx:id="description" maxWidth="1.7976931348623157E308" minHeight="-Infinity"
+                          minWidth="-Infinity"/>
+           </HBox>
+           <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0">
+               <Label minWidth="95.0" text="%File type">
+                   <padding>
+                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                   </padding>
+               </Label>
+               <ComboBox fx:id="fileType"/>
+           </HBox>
+       </VBox>
+   </content>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
new file mode 100644
index 00000000000..c3ab7f2de4e
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
@@ -0,0 +1,45 @@
+package org.jabref.gui.filelist;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
+
+import org.jabref.gui.AbstractController;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.model.entry.LinkedFile;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class LinkedFileEditDialogController extends AbstractController<FileListDialogViewModel> {
+
+    private static final Log LOGGER = LogFactory.getLog(LinkedFileEditDialogController.class);
+
+    @FXML private TextField link;
+    @FXML private TextField description;
+    @FXML private ComboBox<ExternalFileType> fileType;
+
+    @Inject private DialogService dialogService;
+    @Inject private StateManager stateManager;
+    @Inject private LinkedFile linkedFile;
+
+    @FXML
+    private void initialize() {
+        viewModel = new FileListDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService);
+        fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
+        description.textProperty().bindBidirectional(viewModel.descriptionProperty());
+        link.textProperty().bindBidirectional(viewModel.linkProperty());
+        fileType.valueProperty().bindBidirectional(viewModel.getSelectedExternalFileType());
+    }
+
+    @FXML
+    private void openBrowseDialog(ActionEvent event) {
+        viewModel.openBrowseDialog();
+        link.requestFocus();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
new file mode 100644
index 00000000000..9db9e36f352
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
@@ -0,0 +1,41 @@
+package org.jabref.gui.filelist;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.DialogPane;
+
+import org.jabref.gui.AbstractReturnDialogView;
+import org.jabref.gui.FXDialog;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.LinkedFile;
+
+public class LinkedFileEditDialogView extends AbstractReturnDialogView<Boolean> {
+
+    public LinkedFileEditDialogView(LinkedFile linkedFile) {
+        super(createContext(linkedFile));
+    }
+
+    private static Function<String, Object> createContext(LinkedFile linkedFile) {
+        Map<String, Object> context = new HashMap<>();
+        context.put("linkedFile", linkedFile);
+        return context::get;
+    }
+
+    /**
+     * @return true if the user accepts the change
+     */
+    @Override
+    public Boolean showAndWait() {
+        FXDialog dialog = new FXDialog(AlertType.INFORMATION, Localization.lang("Edit linked file"));
+        dialog.setDialogPane((DialogPane) this.getView());
+        dialog.getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
+        dialog.setResizable(true);
+        Optional<ButtonType> buttonPressed = dialog.showAndWait();
+        return buttonPressed.equals(Optional.of(ButtonType.YES));
+    }
+}
diff --git a/src/main/resources/org/jabref/gui/filelist/FileListDialog.fxml b/src/main/resources/org/jabref/gui/filelist/FileListDialog.fxml
deleted file mode 100644
index 25dc5b29804..00000000000
--- a/src/main/resources/org/jabref/gui/filelist/FileListDialog.fxml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-
-<DialogPane prefHeight="100.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.FileListDialogController">
-   <content>
-      <VBox maxWidth="1.7976931348623157E308">
-         <children>
-            <HBox prefHeight="100.0" spacing="10.0">
-               <children>
-                  <Label maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="95.0" text="Link">
-                     <padding>
-                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                     </padding>
-                  </Label>
-                  <TextField fx:id="tfLink" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" />
-                  <Button fx:id="btnBrowse" minWidth="-Infinity" mnemonicParsing="false" onAction="#browseFileDialog" text="Browse" />
-                  <Button fx:id="btnOpen" minWidth="-Infinity" mnemonicParsing="false" onAction="#openFile" text="Open">
-                     <HBox.margin>
-                        <Insets />
-                     </HBox.margin>
-                  </Button>
-               </children>
-               <padding>
-                  <Insets top="10.0" />
-               </padding>
-            </HBox>
-            <HBox layoutX="21.0" layoutY="21.0" prefHeight="100.0" spacing="10.0">
-               <children>
-                  <Label minWidth="95.0" text="Description">
-                     <HBox.margin>
-                        <Insets />
-                     </HBox.margin>
-                     <padding>
-                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                     </padding>
-                  </Label>
-                  <TextField fx:id="tfDescription" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" />
-               </children>
-            </HBox>
-            <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0">
-               <children>
-                  <Label minWidth="95.0" text="File type">
-                     <padding>
-                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                     </padding>
-                  </Label>
-                  <ComboBox fx:id="cmbFileType" />
-               </children>
-            </HBox>
-            <ButtonBar>
-              <buttons>
-                <Button fx:id="btnOk" defaultButton="true" mnemonicParsing="false" onAction="#ok_clicked" text="OK" />
-                  <Button fx:id="btnCancel" cancelButton="true" mnemonicParsing="false" onAction="#cancel" text="Cancel" />
-              </buttons>
-            </ButtonBar>
-         </children>
-      </VBox>
-   </content>
-</DialogPane>

From cb7096c39fb21679f0857cce45c5dd517c5b9f24 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 17 Mar 2018 13:56:19 +0100
Subject: [PATCH 13/36] Merge remote-tracking branch 'upstream/master' into
 maintable-beta

* upstream/master:
  Provides download option in context menu and fixes #3614 (#3824)
  Minor refactoring

# Conflicts:
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
#	src/test/java/org/jabref/architecture/TestArchitectureTests.java
#	src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
---
 ...stDialogViewModel.java => LinkedFilesEditDialogViewModel.java} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/main/java/org/jabref/gui/filelist/{FileListDialogViewModel.java => LinkedFilesEditDialogViewModel.java} (100%)

diff --git a/src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
similarity index 100%
rename from src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java
rename to src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java

From fbf8fdb216120ef4783c769622260d15b25d3511 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 17 Mar 2018 13:59:02 +0100
Subject: [PATCH 14/36] Create Wrapper to pass LinkedFile around TODO: what do
 to on edit? How to save the new file?

---
 .../gui/fieldeditors/LinkedFileViewModel.java | 89 ++++++++++---------
 .../jabref/gui/filelist/AttachFileAction.java | 14 ++-
 .../LinkedFileEditDialogController.java       | 11 +--
 .../filelist/LinkedFileEditDialogView.java    |  9 +-
 .../LinkedFilesEditDialogViewModel.java       | 41 +++++----
 .../gui/filelist/LinkedFilesWrapper.java      | 19 ++++
 6 files changed, 106 insertions(+), 77 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/filelist/LinkedFilesWrapper.java

diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 905a2bd9613..fcc84f2d416 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -9,7 +9,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.swing.SwingUtilities;
 import javax.xml.transform.TransformerException;
 
 import javafx.beans.Observable;
@@ -28,7 +27,8 @@
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.filelist.FileListEntryEditor;
+import org.jabref.gui.filelist.LinkedFileEditDialogView;
+import org.jabref.gui.filelist.LinkedFilesWrapper;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.cleanup.MoveFilesCleanup;
@@ -146,8 +146,8 @@ public void open() {
             boolean successful = JabRefDesktop.openExternalFileAnyFormat(databaseContext, linkedFile.getLink(), type);
             if (!successful) {
                 dialogService.showErrorDialogAndWait(
-                        Localization.lang("File not found"),
-                        Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+                                                     Localization.lang("File not found"),
+                                                     Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
             }
         } catch (IOException e) {
             dialogService.showErrorDialogAndWait(Localization.lang("Error opening file '%0'.", getLink()), e);
@@ -188,26 +188,26 @@ public void rename() {
         Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(Globals.prefs.getFileDirectoryPreferences());
         if (!fileDir.isPresent()) {
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("Rename file"),
-                    Localization.lang("File directory is not set or does not exist!"));
+                                                 Localization.lang("Rename file"),
+                                                 Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
         Optional<Path> file = linkedFile.findIn(databaseContext, Globals.prefs.getFileDirectoryPreferences());
         if ((file.isPresent()) && Files.exists(file.get())) {
             RenamePdfCleanup pdfCleanup = new RenamePdfCleanup(false,
-                    databaseContext,
-                    Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileNamePattern(),
-                    Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader),
-                    Globals.prefs.getFileDirectoryPreferences(), linkedFile);
+                                                               databaseContext,
+                                                               Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileNamePattern(),
+                                                               Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader),
+                                                               Globals.prefs.getFileDirectoryPreferences(), linkedFile);
 
             String targetFileName = pdfCleanup.getTargetFileName(linkedFile, entry);
 
             boolean confirm = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Rename file"),
-                    Localization.lang("Rename file to") + " " + targetFileName,
-                    Localization.lang("Rename file"),
-                    Localization.lang("Cancel"));
+                                                                          Localization.lang("Rename file"),
+                                                                          Localization.lang("Rename file to") + " " + targetFileName,
+                                                                          Localization.lang("Rename file"),
+                                                                          Localization.lang("Cancel"));
 
             if (confirm) {
                 Optional<Path> fileConflictCheck = pdfCleanup.findExistingFile(linkedFile, entry);
@@ -216,8 +216,8 @@ public void rename() {
             }
         } else {
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("File not found"),
-                    Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+                                                 Localization.lang("File not found"),
+                                                 Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
@@ -228,23 +228,23 @@ private void performRenameWithConflictCheck(Optional<Path> file, RenamePdfCleanu
                 pdfCleanup.cleanupWithException(entry);
             } catch (IOException e) {
                 dialogService.showErrorDialogAndWait(
-                        Localization.lang("Rename failed"),
-                        Localization.lang("JabRef cannot access the file because it is being used by another process."));
+                                                     Localization.lang("Rename failed"),
+                                                     Localization.lang("JabRef cannot access the file because it is being used by another process."));
             }
         } else {
             confirm = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("File exists"),
-                    Localization.lang("'%0' exists. Overwrite file?", targetFileName),
-                    Localization.lang("Overwrite"),
-                    Localization.lang("Cancel"));
+                                                                  Localization.lang("File exists"),
+                                                                  Localization.lang("'%0' exists. Overwrite file?", targetFileName),
+                                                                  Localization.lang("Overwrite"),
+                                                                  Localization.lang("Cancel"));
             if (confirm) {
                 try {
                     FileUtil.renameFileWithException(fileConflictCheck.get(), file.get(), true);
                     pdfCleanup.cleanupWithException(entry);
                 } catch (IOException e) {
                     dialogService.showErrorDialogAndWait(
-                            Localization.lang("Rename failed"),
-                            Localization.lang("JabRef cannot access the file because it is being used by another process."));
+                                                         Localization.lang("Rename failed"),
+                                                         Localization.lang("JabRef cannot access the file because it is being used by another process."));
                 }
             }
         }
@@ -260,8 +260,8 @@ public void moveToDefaultDirectory() {
         Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(Globals.prefs.getFileDirectoryPreferences());
         if (!fileDir.isPresent()) {
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("Move file"),
-                    Localization.lang("File directory is not set or does not exist!"));
+                                                 Localization.lang("Move file"),
+                                                 Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
@@ -269,23 +269,23 @@ public void moveToDefaultDirectory() {
         if ((file.isPresent()) && Files.exists(file.get())) {
             // Linked file exists, so move it
             MoveFilesCleanup moveFiles = new MoveFilesCleanup(databaseContext,
-                    Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileDirPattern(),
-                    Globals.prefs.getFileDirectoryPreferences(),
-                    Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader), linkedFile);
+                                                              Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileDirPattern(),
+                                                              Globals.prefs.getFileDirectoryPreferences(),
+                                                              Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader), linkedFile);
 
             boolean confirm = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Move file"),
-                    Localization.lang("Move file to file directory?") + " " + fileDir.get(),
-                    Localization.lang("Move file"),
-                    Localization.lang("Cancel"));
+                                                                          Localization.lang("Move file"),
+                                                                          Localization.lang("Move file to file directory?") + " " + fileDir.get(),
+                                                                          Localization.lang("Move file"),
+                                                                          Localization.lang("Cancel"));
             if (confirm) {
                 moveFiles.cleanup(entry);
             }
         } else {
             // File doesn't exist, so we can't move it.
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("File not found"),
-                    Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+                                                 Localization.lang("File not found"),
+                                                 Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
@@ -300,9 +300,9 @@ public boolean delete(FileDirectoryPreferences prefs) {
         ButtonType removeFromEntry = new ButtonType(Localization.lang("Remove from entry"), ButtonData.YES);
         ButtonType deleteFromEntry = new ButtonType(Localization.lang("Delete from disk"));
         Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
-                Localization.lang("Delete '%0'", file.get().toString()),
-                Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
-                removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
+                                                                                      Localization.lang("Delete '%0'", file.get().toString()),
+                                                                                      Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
+                                                                                      removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -316,8 +316,8 @@ public boolean delete(FileDirectoryPreferences prefs) {
                     return true;
                 } catch (IOException ex) {
                     dialogService.showErrorDialogAndWait(
-                            Localization.lang("Cannot delete file"),
-                            Localization.lang("File permission error"));
+                                                         Localization.lang("Cannot delete file"),
+                                                         Localization.lang("File permission error"));
                     LOGGER.warn("File permission error while deleting: " + linkedFile, ex);
                 }
             }
@@ -326,8 +326,13 @@ public boolean delete(FileDirectoryPreferences prefs) {
     }
 
     public void edit() {
-        FileListEntryEditor editor = new FileListEntryEditor(linkedFile, false, true, databaseContext);
-        SwingUtilities.invokeLater(() -> editor.setVisible(true, false));
+        LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
+        wrapper.setLinkedFile(this.linkedFile);
+        LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
+        if (dialog.showAndWait()) {
+            // TODO: What do when saved?
+        }
+
     }
 
     public void writeXMPMetadata() {
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index 1f5e634f144..f16add8b074 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -22,10 +22,18 @@ public void action() {
             return;
         }
         BibEntry entry = panel.getSelectedEntries().get(0);
-        LinkedFile linkedFile = new LinkedFile("", "", "");
-        LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
+        LinkedFile linkedFile = new LinkedFile("test", "st", "pdf");
+        LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
+        wrapper.setLinkedFile(linkedFile);
+        LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
 
-        DefaultTaskExecutor.runInJavaFXThread((Runnable) dialog::showAndWait);
+        boolean applyPressed = DefaultTaskExecutor.runInJavaFXThread(() -> dialog.showAndWait());
+        if (applyPressed) {
+            LinkedFilesEditDialogViewModel model = (LinkedFilesEditDialogViewModel) dialog.getController().get().getViewModel();
+            linkedFile = model.getNewLinkedFile();
+            entry.addFile(linkedFile);
+
+        }
         //
 
         /*   FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true,
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
index c3ab7f2de4e..eeb4ef3fdb1 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
@@ -11,14 +11,9 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.model.entry.LinkedFile;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+public class LinkedFileEditDialogController extends AbstractController<LinkedFilesEditDialogViewModel> {
 
-public class LinkedFileEditDialogController extends AbstractController<FileListDialogViewModel> {
-
-    private static final Log LOGGER = LogFactory.getLog(LinkedFileEditDialogController.class);
 
     @FXML private TextField link;
     @FXML private TextField description;
@@ -26,11 +21,11 @@ public class LinkedFileEditDialogController extends AbstractController<FileListD
 
     @Inject private DialogService dialogService;
     @Inject private StateManager stateManager;
-    @Inject private LinkedFile linkedFile;
+    @Inject private LinkedFilesWrapper linkedFilesWrapper;
 
     @FXML
     private void initialize() {
-        viewModel = new FileListDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService);
+        viewModel = new LinkedFilesEditDialogViewModel(linkedFilesWrapper.getLinkedFile(), stateManager.getActiveDatabase().get(), dialogService);
         fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
         description.textProperty().bindBidirectional(viewModel.descriptionProperty());
         link.textProperty().bindBidirectional(viewModel.linkProperty());
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
index 9db9e36f352..d5479dffd1d 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
@@ -12,17 +12,16 @@
 import org.jabref.gui.AbstractReturnDialogView;
 import org.jabref.gui.FXDialog;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.LinkedFile;
 
 public class LinkedFileEditDialogView extends AbstractReturnDialogView<Boolean> {
 
-    public LinkedFileEditDialogView(LinkedFile linkedFile) {
+    public LinkedFileEditDialogView(LinkedFilesWrapper linkedFile) {
         super(createContext(linkedFile));
     }
 
-    private static Function<String, Object> createContext(LinkedFile linkedFile) {
+    private static Function<String, Object> createContext(LinkedFilesWrapper linkedFilesWrapper) {
         Map<String, Object> context = new HashMap<>();
-        context.put("linkedFile", linkedFile);
+        context.put("linkedFilesWrapper", linkedFilesWrapper);
         return context::get;
     }
 
@@ -36,6 +35,6 @@ public Boolean showAndWait() {
         dialog.getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
         dialog.setResizable(true);
         Optional<ButtonType> buttonPressed = dialog.showAndWait();
-        return buttonPressed.equals(Optional.of(ButtonType.YES));
+        return buttonPressed.equals(Optional.of(ButtonType.APPLY));
     }
 }
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 8ce9c6e864c..46f9bffd134 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -27,7 +27,7 @@
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.JabRefPreferences;
 
-public class FileListDialogViewModel extends AbstractViewModel {
+public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
 
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
     private final StringProperty linkProperty = new SimpleStringProperty("");
@@ -37,13 +37,11 @@ public class FileListDialogViewModel extends AbstractViewModel {
     private final BibDatabaseContext database;
     private final DialogService dialogService;
 
-    private final LinkedFile linkedFile;
-
-    public FileListDialogViewModel(LinkedFile linkedFile, BibDatabaseContext database, DialogService dialogService) {
-        this.linkedFile = linkedFile;
+    public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext database, DialogService dialogService) {
         this.database = database;
         this.dialogService = dialogService;
         externalfilesTypes.set(FXCollections.observableArrayList(ExternalFileTypes.getInstance().getExternalFileTypeSelection()));
+        setValues(linkedFile);
     }
 
     private void checkExtension() {
@@ -64,28 +62,27 @@ private void checkExtension() {
     public void openBrowseDialog() {
         String fileText = linkProperty().get();
 
-        Optional<Path> file = FileHelper.expandFilename(database, fileText,
-                Globals.prefs.getFileDirectoryPreferences());
+        Optional<Path> file = FileHelper.expandFilename(database, fileText, Globals.prefs.getFileDirectoryPreferences());
 
         Path workingDir = file.orElse(Paths.get(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)));
         String fileName = Paths.get(fileText).getFileName().toString();
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(workingDir)
-                .withInitialFileName(fileName).build();
+                                                                                               .withInitialDirectory(workingDir)
+                                                                                               .withInitialFileName(fileName)
+                                                                                               .build();
         dialogService.showFileOpenDialog(fileDialogConfiguration)
-                .ifPresent(path -> {
-            // Store the directory for next time:
-                    Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, path.toString());
+                     .ifPresent(path -> {
+                         // Store the directory for next time:
+                         Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, path.toString());
 
-            // If the file is below the file directory, make the path relative:
-                    List<Path> fileDirectories = database
-                    .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
-                    path = FileUtil.shortenFileName(path, fileDirectories);
+                         // If the file is below the file directory, make the path relative:
+                         List<Path> fileDirectories = database.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+                         path = FileUtil.shortenFileName(path, fileDirectories);
 
-                    linkProperty().set(path.toString());
-            checkExtension();
-        });
+                         linkProperty().set(path.toString());
+                         checkExtension();
+                     });
     }
 
     //
@@ -119,4 +116,10 @@ public ListProperty<ExternalFileType> externalFileTypeProperty() {
     public ObjectProperty<ExternalFileType> getSelectedExternalFileType() {
         return selectedExternalFileType;
     }
+
+    public LinkedFile getNewLinkedFile() {
+        return new LinkedFile(descriptionProperty.getValue(), linkProperty.getValue(), selectedExternalFileType.getValue().toString());
+
+    }
+
 }
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesWrapper.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesWrapper.java
new file mode 100644
index 00000000000..d71ce16d08d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesWrapper.java
@@ -0,0 +1,19 @@
+package org.jabref.gui.filelist;
+
+import org.jabref.model.entry.LinkedFile;
+
+/**
+ * Workaround to inject {@link LinkedFile} into javafx controller
+ */
+public class LinkedFilesWrapper {
+
+    private LinkedFile linkedFile;
+
+    public LinkedFile getLinkedFile() {
+        return linkedFile;
+    }
+
+    public void setLinkedFile(LinkedFile linkedFile) {
+        this.linkedFile = linkedFile;
+    }
+}

From cc6f3b95afafdb8f45d6ab9662c6e1684a082e92 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 17 Mar 2018 17:36:00 +0100
Subject: [PATCH 15/36] fix some indentations update File after Edit

---
 .../gui/fieldeditors/LinkedFileViewModel.java | 43 ++++++++-----------
 .../jabref/gui/filelist/AttachFileAction.java |  1 -
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index fcc84f2d416..5a8ae95f5df 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -28,6 +28,7 @@
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.filelist.LinkedFileEditDialogView;
+import org.jabref.gui.filelist.LinkedFilesEditDialogViewModel;
 import org.jabref.gui.filelist.LinkedFilesWrapper;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
@@ -187,9 +188,7 @@ public void rename() {
         }
         Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(Globals.prefs.getFileDirectoryPreferences());
         if (!fileDir.isPresent()) {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("Rename file"),
-                                                 Localization.lang("File directory is not set or does not exist!"));
+            dialogService.showErrorDialogAndWait(Localization.lang("Rename file"), Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
@@ -203,8 +202,7 @@ public void rename() {
 
             String targetFileName = pdfCleanup.getTargetFileName(linkedFile, entry);
 
-            boolean confirm = dialogService.showConfirmationDialogAndWait(
-                                                                          Localization.lang("Rename file"),
+            boolean confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("Rename file"),
                                                                           Localization.lang("Rename file to") + " " + targetFileName,
                                                                           Localization.lang("Rename file"),
                                                                           Localization.lang("Cancel"));
@@ -215,9 +213,7 @@ public void rename() {
                 performRenameWithConflictCheck(file, pdfCleanup, targetFileName, fileConflictCheck);
             }
         } else {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("File not found"),
-                                                 Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+            dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
@@ -227,13 +223,10 @@ private void performRenameWithConflictCheck(Optional<Path> file, RenamePdfCleanu
             try {
                 pdfCleanup.cleanupWithException(entry);
             } catch (IOException e) {
-                dialogService.showErrorDialogAndWait(
-                                                     Localization.lang("Rename failed"),
-                                                     Localization.lang("JabRef cannot access the file because it is being used by another process."));
+                dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"), Localization.lang("JabRef cannot access the file because it is being used by another process."));
             }
         } else {
-            confirm = dialogService.showConfirmationDialogAndWait(
-                                                                  Localization.lang("File exists"),
+            confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("File exists"),
                                                                   Localization.lang("'%0' exists. Overwrite file?", targetFileName),
                                                                   Localization.lang("Overwrite"),
                                                                   Localization.lang("Cancel"));
@@ -242,9 +235,7 @@ private void performRenameWithConflictCheck(Optional<Path> file, RenamePdfCleanu
                     FileUtil.renameFileWithException(fileConflictCheck.get(), file.get(), true);
                     pdfCleanup.cleanupWithException(entry);
                 } catch (IOException e) {
-                    dialogService.showErrorDialogAndWait(
-                                                         Localization.lang("Rename failed"),
-                                                         Localization.lang("JabRef cannot access the file because it is being used by another process."));
+                    dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"), Localization.lang("JabRef cannot access the file because it is being used by another process."));
                 }
             }
         }
@@ -259,8 +250,7 @@ public void moveToDefaultDirectory() {
         // Get target folder
         Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(Globals.prefs.getFileDirectoryPreferences());
         if (!fileDir.isPresent()) {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("Move file"),
+            dialogService.showErrorDialogAndWait(Localization.lang("Move file"),
                                                  Localization.lang("File directory is not set or does not exist!"));
             return;
         }
@@ -273,8 +263,7 @@ public void moveToDefaultDirectory() {
                                                               Globals.prefs.getFileDirectoryPreferences(),
                                                               Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader), linkedFile);
 
-            boolean confirm = dialogService.showConfirmationDialogAndWait(
-                                                                          Localization.lang("Move file"),
+            boolean confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("Move file"),
                                                                           Localization.lang("Move file to file directory?") + " " + fileDir.get(),
                                                                           Localization.lang("Move file"),
                                                                           Localization.lang("Cancel"));
@@ -283,9 +272,7 @@ public void moveToDefaultDirectory() {
             }
         } else {
             // File doesn't exist, so we can't move it.
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("File not found"),
-                                                 Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+            dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
@@ -302,7 +289,9 @@ public boolean delete(FileDirectoryPreferences prefs) {
         Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
                                                                                       Localization.lang("Delete '%0'", file.get().toString()),
                                                                                       Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
-                                                                                      removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
+                                                                                      removeFromEntry,
+                                                                                      deleteFromEntry,
+                                                                                      ButtonType.CANCEL);
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -330,7 +319,11 @@ public void edit() {
         wrapper.setLinkedFile(this.linkedFile);
         LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
         if (dialog.showAndWait()) {
-            // TODO: What do when saved?
+            LinkedFilesEditDialogViewModel model = (LinkedFilesEditDialogViewModel) dialog.getController().get().getViewModel();
+            LinkedFile editedFile = model.getNewLinkedFile();
+            this.linkedFile.setLink(editedFile.getLink());
+            this.linkedFile.setDescription(editedFile.getDescription());
+            this.linkedFile.setFileType(editedFile.getFileType());
         }
 
     }
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index f16add8b074..2781f59ae84 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -32,7 +32,6 @@ public void action() {
             LinkedFilesEditDialogViewModel model = (LinkedFilesEditDialogViewModel) dialog.getController().get().getViewModel();
             linkedFile = model.getNewLinkedFile();
             entry.addFile(linkedFile);
-
         }
         //
 

From ae7af409022ba62869bb4f45ef33b2afebfc4c59 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 17 Mar 2018 18:32:56 +0100
Subject: [PATCH 16/36] remove open unknown external file type dialog convert
 ImportInspectionDialog to use new file edit dialog

---
 .../org/jabref/gui/desktop/JabRefDesktop.java | 110 +++---------------
 .../ExternalFileMenuItem.java                 |  28 ++---
 .../jabref/gui/filelist/AttachFileAction.java |   2 +-
 .../gui/importer/ImportInspectionDialog.java  |  27 +++--
 .../gui/openoffice/StyleSelectDialog.java     |  46 ++++----
 .../protectedterms/ProtectedTermsDialog.java  |  15 +--
 6 files changed, 66 insertions(+), 162 deletions(-)

diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index 24355d4b8b1..7c5e49b69fd 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/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.IconTheme;
-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.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,81 +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
@@ -284,8 +199,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 +245,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);
                 }
             }
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
index 81d747347df..264a8829a2a 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
@@ -7,10 +7,9 @@
 
 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;
@@ -25,6 +24,7 @@
  * 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;
@@ -34,9 +34,8 @@ public class ExternalFileMenuItem extends JMenuItem implements ActionListener {
     private final JabRefFrame frame;
     private String fieldName;
 
-
     public ExternalFileMenuItem(JabRefFrame frame, BibEntry entry, String name, String link, Icon icon,
-            BibDatabaseContext databaseContext, Optional<ExternalFileType> fileType) {
+                                BibDatabaseContext databaseContext, Optional<ExternalFileType> fileType) {
         super(name, icon);
         this.frame = frame;
         this.entry = entry;
@@ -47,7 +46,7 @@ public ExternalFileMenuItem(JabRefFrame frame, BibEntry entry, String name, Stri
     }
 
     public ExternalFileMenuItem(JabRefFrame frame, BibEntry entry, String name, String link, Icon icon,
-            BibDatabaseContext databaseContext, String fieldName) {
+                                BibDatabaseContext databaseContext, String fieldName) {
         this(frame, entry, name, link, icon, databaseContext, Optional.empty());
         this.fieldName = fieldName;
     }
@@ -77,12 +76,7 @@ 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
@@ -90,12 +84,14 @@ private boolean openLink() {
             // 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;
             }
 
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index 2781f59ae84..2ad41351895 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -22,7 +22,7 @@ public void action() {
             return;
         }
         BibEntry entry = panel.getSelectedEntries().get(0);
-        LinkedFile linkedFile = new LinkedFile("test", "st", "pdf");
+        LinkedFile linkedFile = new LinkedFile("", "", "");
         LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
         wrapper.setLinkedFile(linkedFile);
         LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index 34293fc8dca..bc35fdb9e44 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -68,8 +68,10 @@
 import org.jabref.gui.externalfiletype.ExternalFileMenuItem;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.filelist.FileListEntry;
-import org.jabref.gui.filelist.FileListEntryEditor;
 import org.jabref.gui.filelist.FileListTableModel;
+import org.jabref.gui.filelist.LinkedFileEditDialogView;
+import org.jabref.gui.filelist.LinkedFilesEditDialogViewModel;
+import org.jabref.gui.filelist.LinkedFilesWrapper;
 import org.jabref.gui.groups.GroupTreeNodeViewModel;
 import org.jabref.gui.groups.UndoableChangeEntriesOfGroup;
 import org.jabref.gui.help.HelpAction;
@@ -1315,18 +1317,19 @@ public void actionPerformed(ActionEvent actionEvent) {
                 return;
             }
             entry = selectionModel.getSelected().get(0);
-            LinkedFile flEntry = new LinkedFile("", "", "");
-            FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true, bibDatabaseContext, true);
-            editor.setVisible(true, true);
-            if (editor.okPressed()) {
-                entries.getReadWriteLock().writeLock().lock();
-                try {
-                    entry.addFile(flEntry);
-                } finally {
-                    entries.getReadWriteLock().writeLock().unlock();
-                }
-                glTable.repaint();
+            LinkedFile linkedFile = new LinkedFile("", "", "");
+
+            LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
+            wrapper.setLinkedFile(linkedFile);
+            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
+
+            boolean applyPressed = DefaultTaskExecutor.runInJavaFXThread(() -> dialog.showAndWait());
+            if (applyPressed) {
+                LinkedFilesEditDialogViewModel model = (LinkedFilesEditDialogViewModel) dialog.getController().get().getViewModel();
+                linkedFile = model.getNewLinkedFile();
+                entry.addFile(linkedFile);
             }
+
         }
 
         @Override
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
index 799cf4fe015..d308203999d 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
@@ -42,7 +42,6 @@
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -53,7 +52,6 @@
 import org.jabref.logic.openoffice.StyleLoader;
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.TestEntry;
-import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -146,9 +144,10 @@ private void init() {
 
         FormBuilder builder = FormBuilder.create();
         builder.layout(new FormLayout("fill:pref:grow, 4dlu, left:pref, 4dlu, left:pref",
-                "pref, 4dlu, 100dlu:grow, 4dlu, pref, 4dlu, fill:100dlu"));
-        builder.add(Localization.lang("Select one of the available styles or add a style file from disk.")).xyw(1, 1,
-                5);
+                                      "pref, 4dlu, 100dlu:grow, 4dlu, pref, 4dlu, fill:100dlu"));
+        builder.add(Localization.lang("Select one of the available styles or add a style file from disk.")).xyw(1,
+                                                                                                                1,
+                                                                                                                5);
         builder.add(new JScrollPane(table)).xyw(1, 3, 5);
         builder.add(addButton).xy(3, 5);
         builder.add(removeButton).xy(5, 5);
@@ -164,7 +163,7 @@ private void init() {
             public void actionPerformed(ActionEvent event) {
                 if ((table.getRowCount() == 0) || (table.getSelectedRowCount() == 0)) {
                     frame.getDialogService().showErrorDialogAndWait(Localization.lang("Style selection"),
-                            Localization.lang("You must select a valid style file."));
+                                                                    Localization.lang("You must select a valid style file."));
                     return;
                 }
                 okPressed = true;
@@ -201,7 +200,7 @@ public void actionPerformed(ActionEvent event) {
         diag.pack();
 
         WindowLocation pw = new WindowLocation(diag, JabRefPreferences.STYLES_POS_X, JabRefPreferences.STYLES_POS_Y,
-                JabRefPreferences.STYLES_SIZE_X, JabRefPreferences.STYLES_SIZE_Y);
+                                               JabRefPreferences.STYLES_SIZE_X, JabRefPreferences.STYLES_SIZE_Y);
         pw.displayWindowAtStoredLocation();
     }
 
@@ -210,7 +209,7 @@ private void setupTable() {
         EventList<OOBibStyle> sortedStyles = new SortedList<>(styles);
 
         tableModel = (DefaultEventTableModel<OOBibStyle>) GlazedListsSwing
-                .eventTableModelWithThreadProxyList(sortedStyles, new StyleTableFormat());
+                                                                          .eventTableModelWithThreadProxyList(sortedStyles, new StyleTableFormat());
         table = new JTable(tableModel);
         TableColumnModel cm = table.getColumnModel();
         cm.getColumn(0).setPreferredWidth(100);
@@ -218,7 +217,7 @@ private void setupTable() {
         cm.getColumn(2).setPreferredWidth(80);
 
         selectionModel = (DefaultEventSelectionModel<OOBibStyle>) GlazedListsSwing
-                .eventSelectionModelWithThreadProxyList(sortedStyles);
+                                                                                  .eventSelectionModelWithThreadProxyList(sortedStyles);
         table.setSelectionModel(selectionModel);
         table.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         table.addMouseListener(new MouseAdapter() {
@@ -252,12 +251,9 @@ private void setupPopupMenu() {
             Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt("jstyle");
             String link = style.getPath();
             try {
-                if (type.isPresent()) {
-                    JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), link, type);
-                } else {
-                    JabRefDesktop.openExternalFileUnknown(frame, new BibEntry(), new BibDatabaseContext(), link,
-                            new UnknownExternalFileType("jstyle"));
-                }
+
+                JabRefDesktop.openExternalFileAnyFormat(frame.getCurrentBasePanel().getDatabaseContext(), link, type);
+
             } catch (IOException e) {
                 LOGGER.warn("Problem open style file editor", e);
             }
@@ -270,9 +266,9 @@ private void setupPopupMenu() {
         removeAction = actionEvent -> getSelectedStyle().ifPresent(style -> {
 
             if (!style.isFromResource() && frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Remove style"),
-                    Localization.lang("Are you sure you want to remove the style?"),
-                    Localization.lang("Remove style"),
-                    Localization.lang("Cancel"))) {
+                                                                                                  Localization.lang("Are you sure you want to remove the style?"),
+                                                                                                  Localization.lang("Remove style"),
+                                                                                                  Localization.lang("Cancel"))) {
                 if (!loader.removeStyle(style)) {
                     LOGGER.info("Problem removing style");
                 }
@@ -470,14 +466,14 @@ public AddFileDialog() {
 
             JButton browse = new JButton(Localization.lang("Browse"));
             FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .addExtensionFilter(FileType.JSTYLE)
-                    .withDefaultExtension(FileType.JSTYLE)
-                    .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                    .build();
+                                                                                                   .addExtensionFilter(FileType.JSTYLE)
+                                                                                                   .withDefaultExtension(FileType.JSTYLE)
+                                                                                                   .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                                   .build();
 
             browse.addActionListener(e -> {
                 Optional<Path> file = DefaultTaskExecutor
-                        .runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
+                                                         .runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
                 file.ifPresent(f -> newFile.setText(f.toAbsolutePath().toString()));
             });
 
@@ -517,8 +513,8 @@ public void actionPerformed(ActionEvent e) {
 
             // Key bindings:
             bb.getPanel()
-                    .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-                    .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+              .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+              .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
             bb.getPanel().getActionMap().put("close", cancelAction);
             pack();
             setLocationRelativeTo(diag);
diff --git a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
index 8936805bd96..6ceac265394 100644
--- a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
+++ b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
@@ -35,14 +35,12 @@
 import javax.swing.table.TableColumnModel;
 
 import org.jabref.Globals;
-import org.jabref.gui.DialogService;
 import org.jabref.gui.IconTheme;
 import org.jabref.gui.JabRefDialog;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -52,7 +50,6 @@
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.util.FileType;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
@@ -235,12 +232,8 @@ private void setupPopupMenu() {
                     // Fall back to ".txt"
                     Optional<ExternalFileType> txtType = ExternalFileTypes.getInstance()
                             .getExternalFileTypeByExt("txt");
-                    if (txtType.isPresent()) {
-                        JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), fileName, txtType);
-                    } else {
-                        JabRefDesktop.openExternalFileUnknown(frame, new BibEntry(), new BibDatabaseContext(), fileName,
-                                new UnknownExternalFileType("terms"));
-                    }
+                    JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), fileName, type);
+
                 }
             } catch (IOException e) {
                 LOGGER.warn("Problem open protected terms file editor", e);
@@ -433,11 +426,9 @@ public AddFileDialog() {
                     .addExtensionFilter(FileType.TERMS)
                     .withDefaultExtension(FileType.TERMS)
                     .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-            DialogService ds = frame.getDialogService();
 
             browse.addActionListener(e -> {
-                Optional<Path> file = DefaultTaskExecutor
-                        .runInJavaFXThread(() -> ds.showFileOpenDialog(fileDialogConfiguration));
+                Optional<Path> file = DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
                 file.ifPresent(f -> newFile.setText(f.toAbsolutePath().toString()));
             });
 

From 3f7c2826762e33d055fba7efd9f79af986db6692 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 18 Mar 2018 23:05:10 +0100
Subject: [PATCH 17/36] fix indentation

---
 .../gui/fieldeditors/LinkedFileViewModel.java | 99 ++++++-------------
 .../LinkedFilesEditDialogViewModel.java       |  1 -
 2 files changed, 32 insertions(+), 68 deletions(-)

diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index a9bf782ded1..ce0150c6762 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -165,9 +165,7 @@ public void open() {
             Optional<ExternalFileType> type = ExternalFileTypes.getInstance().fromLinkedFile(linkedFile, true);
             boolean successful = JabRefDesktop.openExternalFileAnyFormat(databaseContext, linkedFile.getLink(), type);
             if (!successful) {
-                dialogService.showErrorDialogAndWait(
-                                                     Localization.lang("File not found"),
-                                                     Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+                dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
             }
         } catch (IOException e) {
             dialogService.showErrorDialogAndWait(Localization.lang("Error opening file '%0'.", linkedFile.getLink()), e);
@@ -207,36 +205,27 @@ public void rename() {
         }
         Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
         if (!fileDir.isPresent()) {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("Rename file"),
-                                                 Localization.lang("File directory is not set or does not exist!"));
+            dialogService.showErrorDialogAndWait(Localization.lang("Rename file"), Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
         Optional<Path> file = linkedFile.findIn(databaseContext, fileDirectoryPreferences);
         if ((file.isPresent()) && Files.exists(file.get())) {
-            RenamePdfCleanup pdfCleanup = new RenamePdfCleanup(false,
-                                                               databaseContext,
-                                                               fileDirPattern,
-                                                               fileDirectoryPreferences, linkedFile);
+            RenamePdfCleanup pdfCleanup = new RenamePdfCleanup(false, databaseContext, fileDirPattern, fileDirectoryPreferences, linkedFile);
 
             String targetFileName = pdfCleanup.getTargetFileName(linkedFile, entry);
 
-            boolean confirm = dialogService.showConfirmationDialogAndWait(
-                                                                          Localization.lang("Rename file"),
-                                                                          Localization.lang("Rename file to") + " " + targetFileName,
-                                                                          Localization.lang("Rename file"),
-                                                                          Localization.lang("Cancel"));
+            boolean confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("Rename file"),
+            Localization.lang("Rename file to") + " " + targetFileName,
+            Localization.lang("Rename file"),
+            Localization.lang("Cancel"));
 
             if (confirm) {
                 Optional<Path> fileConflictCheck = pdfCleanup.findExistingFile(linkedFile, entry);
-
                 performRenameWithConflictCheck(file, pdfCleanup, targetFileName, fileConflictCheck);
             }
         } else {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("File not found"),
-                                                 Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+            dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
@@ -246,24 +235,21 @@ private void performRenameWithConflictCheck(Optional<Path> file, RenamePdfCleanu
             try {
                 pdfCleanup.cleanupWithException(entry);
             } catch (IOException e) {
-                dialogService.showErrorDialogAndWait(
-                                                     Localization.lang("Rename failed"),
-                                                     Localization.lang("JabRef cannot access the file because it is being used by another process."));
+                dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"), Localization.lang("JabRef cannot access the file because it is being used by another process."));
             }
         } else {
-            confirm = dialogService.showConfirmationDialogAndWait(
-                                                                  Localization.lang("File exists"),
-                                                                  Localization.lang("'%0' exists. Overwrite file?", targetFileName),
-                                                                  Localization.lang("Overwrite"),
-                                                                  Localization.lang("Cancel"));
+            confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("File exists"),
+            Localization.lang("'%0' exists. Overwrite file?", targetFileName),
+            Localization.lang("Overwrite"),
+            Localization.lang("Cancel"));
+
             if (confirm) {
                 try {
                     FileUtil.renameFileWithException(fileConflictCheck.get(), file.get(), true);
                     pdfCleanup.cleanupWithException(entry);
                 } catch (IOException e) {
-                    dialogService.showErrorDialogAndWait(
-                                                         Localization.lang("Rename failed"),
-                                                         Localization.lang("JabRef cannot access the file because it is being used by another process."));
+                    dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"),
+                    Localization.lang("JabRef cannot access the file because it is being used by another process."));
                 }
             }
         }
@@ -278,33 +264,22 @@ public void moveToDefaultDirectory() {
         // Get target folder
         Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
         if (!fileDir.isPresent()) {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("Move file"),
-                                                 Localization.lang("File directory is not set or does not exist!"));
+            dialogService.showErrorDialogAndWait(Localization.lang("Move file"), Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
         Optional<Path> file = linkedFile.findIn(databaseContext, fileDirectoryPreferences);
         if ((file.isPresent()) && Files.exists(file.get())) {
             // Linked file exists, so move it
-            MoveFilesCleanup moveFiles = new MoveFilesCleanup(databaseContext,
-                                                              fileDirPattern,
-                                                              fileDirectoryPreferences,
-                                                              linkedFile);
-
-            boolean confirm = dialogService.showConfirmationDialogAndWait(
-                                                                          Localization.lang("Move file"),
-                                                                          Localization.lang("Move file to file directory?") + " " + fileDir.get(),
-                                                                          Localization.lang("Move file"),
-                                                                          Localization.lang("Cancel"));
+            MoveFilesCleanup moveFiles = new MoveFilesCleanup(databaseContext, fileDirPattern, fileDirectoryPreferences, linkedFile);
+
+            boolean confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("Move file"), Localization.lang("Move file to file directory?") + " " + fileDir.get(), Localization.lang("Move file"), Localization.lang("Cancel"));
             if (confirm) {
                 moveFiles.cleanup(entry);
             }
         } else {
             // File doesn't exist, so we can't move it.
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("File not found"),
-                                                 Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+            dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
@@ -319,11 +294,9 @@ public boolean delete(FileDirectoryPreferences prefs) {
         ButtonType removeFromEntry = new ButtonType(Localization.lang("Remove from entry"), ButtonData.YES);
         ButtonType deleteFromEntry = new ButtonType(Localization.lang("Delete from disk"));
         Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
-                                                                                      Localization.lang("Delete '%0'", file.get().toString()),
-                                                                                      Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
-                                                                                      removeFromEntry,
-                                                                                      deleteFromEntry,
-                                                                                      ButtonType.CANCEL);
+        Localization.lang("Delete '%0'", file.get().toString()),
+        Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
+        removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -331,14 +304,11 @@ public boolean delete(FileDirectoryPreferences prefs) {
             }
 
             if (buttonType.get().equals(deleteFromEntry)) {
-
                 try {
                     Files.delete(file.get());
                     return true;
                 } catch (IOException ex) {
-                    dialogService.showErrorDialogAndWait(
-                                                         Localization.lang("Cannot delete file"),
-                                                         Localization.lang("File permission error"));
+                    dialogService.showErrorDialogAndWait(Localization.lang("Cannot delete file"), Localization.lang("File permission error"));
                     LOGGER.warn("File permission error while deleting: " + linkedFile, ex);
                 }
             }
@@ -397,9 +367,7 @@ public void download() {
 
             Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
             if (!targetDirectory.isPresent()) {
-                dialogService.showErrorDialogAndWait(
-                                                     Localization.lang("Download file"),
-                                                     Localization.lang("File directory is not set or does not exist!"));
+                dialogService.showErrorDialogAndWait(Localization.lang("Download file"), Localization.lang("File directory is not set or does not exist!"));
                 return;
             }
             String suffix = suggestedType.map(ExternalFileType::getExtension).orElse("");
@@ -407,19 +375,16 @@ public void download() {
             Path destination = targetDirectory.get().resolve(suggestedName);
 
             BackgroundTask<Void> downloadTask = new FileDownloadTask(urlDownload.getSource(), destination)
-                                                                                                          .onSuccess(event -> {
-                                                                                                              LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences));
-                                                                                                              linkedFile.setLink(newLinkedFile.getLink());
-                                                                                                              linkedFile.setFileType(newLinkedFile.getFileType());
-                                                                                                          })
-                                                                                                          .onFailure(ex -> dialogService.showErrorDialogAndWait("Download failed", ex));
+            .onSuccess(event -> {
+                LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences));
+                linkedFile.setLink(newLinkedFile.getLink());
+                linkedFile.setFileType(newLinkedFile.getFileType());
+            }).onFailure(ex -> dialogService.showErrorDialogAndWait("Download failed", ex));
 
             downloadProgress.bind(downloadTask.workDonePercentageProperty());
             taskExecutor.execute(downloadTask);
         } catch (MalformedURLException exception) {
-            dialogService.showErrorDialogAndWait(
-                                                 Localization.lang("Invalid URL"),
-                                                 exception);
+            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 46f9bffd134..37112886a5b 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -45,7 +45,6 @@ public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext
     }
 
     private void checkExtension() {
-
         if (!linkProperty.getValueSafe().isEmpty()) {
 
             // Check if this looks like a remote link:

From 9d2df1408e1ebb78512a9cea4f0cd9040f9be9c8 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 18 Mar 2018 23:25:28 +0100
Subject: [PATCH 18/36] convert attachFileDialog to javafx show file open
 dialog on attach file show dialog for editing file afterwards

---
 src/main/java/org/jabref/gui/BasePanel.java   |  2 -
 .../jabref/gui/actions/StandardActions.java   |  2 +-
 .../jabref/gui/filelist/AttachFileAction.java | 66 +++++++++++--------
 .../org/jabref/gui/maintable/MainTable.java   |  2 +-
 .../jabref/gui/maintable/RightClickMenu.java  | 12 ++--
 5 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index e5e947cc9c6..970b26fedf2 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -60,7 +60,6 @@
 import org.jabref.gui.externalfiletype.ExternalFileMenuItem;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.filelist.AttachFileAction;
 import org.jabref.gui.filelist.FileListEntry;
 import org.jabref.gui.filelist.FileListTableModel;
 import org.jabref.gui.groups.GroupAddRemoveDialog;
@@ -483,7 +482,6 @@ public void update() {
 
         actions.put(Actions.MERGE_DATABASE, new AppendDatabaseAction(frame, this));
 
-        actions.put(Actions.ADD_FILE_LINK, new AttachFileAction(this));
 
         actions.put(Actions.OPEN_EXTERNAL_FILE, (BaseAction) () -> openExternalFile());
 
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 957277f84a2..0b365735c37 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/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")),
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index 2ad41351895..6bd9005c72a 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -1,53 +1,63 @@
 package org.jabref.gui.filelist;
 
+import java.util.Optional;
+
+import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
-import org.jabref.gui.actions.BaseAction;
-import org.jabref.gui.util.DefaultTaskExecutor;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.LinkedFile;
+import org.jabref.preferences.JabRefPreferences;
 
-public class AttachFileAction implements BaseAction {
+public class AttachFileAction extends SimpleCommand {
 
     private final BasePanel panel;
+    private final DialogService dialogService;
 
-    public AttachFileAction(BasePanel panel) {
+    public AttachFileAction(BasePanel panel, DialogService dialogService) {
         this.panel = panel;
+        this.dialogService = dialogService;
     }
 
     @Override
-    public void action() {
+    public void execute() {
         if (panel.getSelectedEntries().size() != 1) {
             panel.output(Localization.lang("This operation requires exactly one item to be selected."));
             return;
         }
         BibEntry entry = panel.getSelectedEntries().get(0);
-        LinkedFile linkedFile = new LinkedFile("", "", "");
-        LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
-        wrapper.setLinkedFile(linkedFile);
-        LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
-
-        boolean applyPressed = DefaultTaskExecutor.runInJavaFXThread(() -> dialog.showAndWait());
-        if (applyPressed) {
-            LinkedFilesEditDialogViewModel model = (LinkedFilesEditDialogViewModel) dialog.getController().get().getViewModel();
-            linkedFile = model.getNewLinkedFile();
-            entry.addFile(linkedFile);
-        }
-        //
 
-        /*   FileListEntryEditor editor = new FileListEntryEditor(flEntry, false, true,
-                panel.getBibDatabaseContext());
-        editor.setVisible(true, true);
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+        .build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
+            LinkedFile newLinkedFile = new LinkedFile("", newFile.toString(), "");
+
+            LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
+            wrapper.setLinkedFile(newLinkedFile);
+            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
+
+            boolean applyPressed = dialog.showAndWait();
+            if (applyPressed) {
+                LinkedFilesEditDialogViewModel model = (LinkedFilesEditDialogViewModel) dialog.getController().get().getViewModel();
+                newLinkedFile = model.getNewLinkedFile();
 
-        if (editor.okPressed()) {
-            Optional<FieldChange> fieldChange = entry.addFile(flEntry);
+                Optional<FieldChange> fieldChange = entry.addFile(newLinkedFile);
 
-            if (fieldChange.isPresent()) {
-                UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE,
-                        entry.getField(FieldName.FILE).orElse(null), fieldChange.get().getNewValue());
-                panel.getUndoManager().addEdit(ce);
-                panel.markBaseChanged();
+                if (fieldChange.isPresent()) {
+                    UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE,
+                    entry.getField(FieldName.FILE).orElse(null), fieldChange.get().getNewValue());
+                    panel.getUndoManager().addEdit(ce);
+                    panel.markBaseChanged();
+                }
             }
-        }*/
+        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 58074f9ce12..0e7b331c2d2 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -62,7 +62,7 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
                         panel.showAndEdit(entry.getEntry());
                     }
                 })
-                .withContextMenu(entry -> RightClickMenu.create(entry, keyBindingRepository, panel, Globals.getKeyPrefs()))
+        .withContextMenu(entry -> RightClickMenu.create(entry, keyBindingRepository, panel, Globals.getKeyPrefs(), frame.getDialogService()))
                 .setOnDragDetected(this::handleOnDragDetected)
                 .setOnMouseDragEntered(this::handleOnDragEntered)
                 .install(this);
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index a8c5520728d..a4ec62a7385 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -10,10 +10,12 @@
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.Actions;
 import org.jabref.gui.actions.OldCommandWrapper;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.filelist.AttachFileAction;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.menus.ChangeEntryTypeMenu;
 import org.jabref.gui.mergeentries.FetchAndMergeEntry;
@@ -30,7 +32,7 @@
 
 public class RightClickMenu {
 
-    public static ContextMenu create(BibEntryTableViewModel entry, KeyBindingRepository keyBindingRepository, BasePanel panel, KeyBindingRepository keyBindings) {
+    public static ContextMenu create(BibEntryTableViewModel entry, KeyBindingRepository keyBindingRepository, BasePanel panel, KeyBindingRepository keyBindings, DialogService dialogService) {
         ContextMenu contextMenu = new ContextMenu();
         ActionFactory factory = new ActionFactory(keyBindingRepository);
 
@@ -84,7 +86,7 @@ public static ContextMenu create(BibEntryTableViewModel entry, KeyBindingReposit
 
         contextMenu.getItems().add(new ChangeEntryTypeMenu(keyBindings).getChangeEntryTypeMenu(entry.getEntry(), panel.getBibDatabaseContext(), panel.getUndoManager()));
         contextMenu.getItems().add(factory.createMenuItem(StandardActions.MERGE_WITH_FETCHED_ENTRY, getFetchEntryData(panel)));
-        contextMenu.getItems().add(factory.createMenuItem(StandardActions.ADD_FILE_LINK, getAddFileLinkCommand(panel)));
+        contextMenu.getItems().add(factory.createMenuItem(StandardActions.ATTACH_FILE, new AttachFileAction(panel, dialogService)));
         contextMenu.getItems().add(factory.createMenuItem(StandardActions.MERGE_ENTRIES, mergeEntries(panel)));
 
         contextMenu.getItems().add(new SeparatorMenuItem());
@@ -120,11 +122,7 @@ private static OldCommandWrapper mergeEntries(BasePanel panel) {
         return command;
     }
 
-    private static OldCommandWrapper getAddFileLinkCommand(BasePanel panel) {
-        OldCommandWrapper command = new OldCommandWrapper(Actions.ADD_FILE_LINK, panel);
-        command.setExecutable(panel.getMainTable().getSelectedEntries().size() == 1);
-        return command;
-    }
+
 
     private static OldCommandWrapper getFetchEntryData(BasePanel panel) {
         OldCommandWrapper command = new OldCommandWrapper(Actions.MERGE_WITH_FETCHED_ENTRY, panel);

From 38e087efb1168e602aa3c08373825eb0a4cf80b7 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 18 Mar 2018 23:28:32 +0100
Subject: [PATCH 19/36] reformat

---
 .../LinkedFilesEditDialogViewModel.java       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 37112886a5b..63ff0238bbf 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -67,21 +67,21 @@ public void openBrowseDialog() {
         String fileName = Paths.get(fileText).getFileName().toString();
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                                                                                               .withInitialDirectory(workingDir)
-                                                                                               .withInitialFileName(fileName)
-                                                                                               .build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(path -> {
-                         // Store the directory for next time:
-                         Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, path.toString());
-
-                         // If the file is below the file directory, make the path relative:
-                         List<Path> fileDirectories = database.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
-                         path = FileUtil.shortenFileName(path, fileDirectories);
-
-                         linkProperty().set(path.toString());
-                         checkExtension();
-                     });
+        .withInitialDirectory(workingDir)
+        .withInitialFileName(fileName)
+        .build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
+            // Store the directory for next time:
+            Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, path.toString());
+
+            // If the file is below the file directory, make the path relative:
+            List<Path> fileDirectories = database.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+            path = FileUtil.shortenFileName(path, fileDirectories);
+
+            linkProperty().set(path.toString());
+            checkExtension();
+        });
     }
 
     //

From 298a28fe384baf717d2ab9c203a2b2ab286dd855 Mon Sep 17 00:00:00 2001
From: siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 19 Mar 2018 15:50:07 +0100
Subject: [PATCH 20/36] Mark old filelist as deprecated Pass Preferences
 Service instead of Preferences

---
 .../jabref/gui/filelist/FileListEntryEditor.java   |  2 ++
 .../filelist/LinkedFileEditDialogController.java   |  5 ++++-
 .../filelist/LinkedFilesEditDialogViewModel.java   | 14 ++++++++------
 .../org/jabref/preferences/PreferencesService.java |  7 +++++++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
index fc9906a1d84..e0f3ebf2680 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
@@ -61,7 +61,9 @@
  *
  * For use when downloading files, this class also offers a progress bar and a "Downloading..."
  * label that can be hidden when the download is complete.
+ * @deprecated Use {@link LinkedFileEditDialogView}
  */
+@Deprecated
 public class FileListEntryEditor {
 
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
index eeb4ef3fdb1..86067326bf6 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
@@ -11,6 +11,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.preferences.PreferencesService;
 
 public class LinkedFileEditDialogController extends AbstractController<LinkedFilesEditDialogViewModel> {
 
@@ -23,9 +24,11 @@ public class LinkedFileEditDialogController extends AbstractController<LinkedFil
     @Inject private StateManager stateManager;
     @Inject private LinkedFilesWrapper linkedFilesWrapper;
 
+    @Inject private PreferencesService preferences;
+
     @FXML
     private void initialize() {
-        viewModel = new LinkedFilesEditDialogViewModel(linkedFilesWrapper.getLinkedFile(), stateManager.getActiveDatabase().get(), dialogService);
+        viewModel = new LinkedFilesEditDialogViewModel(linkedFilesWrapper.getLinkedFile(), stateManager.getActiveDatabase().get(), dialogService, preferences);
         fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
         description.textProperty().bindBidirectional(viewModel.descriptionProperty());
         link.textProperty().bindBidirectional(viewModel.linkProperty());
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 63ff0238bbf..305094ca567 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -14,7 +14,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
-import org.jabref.Globals;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -26,6 +25,7 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
 
@@ -36,10 +36,12 @@ public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
     private final ObjectProperty<ExternalFileType> selectedExternalFileType = new SimpleObjectProperty<>();
     private final BibDatabaseContext database;
     private final DialogService dialogService;
+    private final PreferencesService preferences;
 
-    public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext database, DialogService dialogService) {
+    public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext database, DialogService dialogService, PreferencesService preferences2) {
         this.database = database;
         this.dialogService = dialogService;
+        this.preferences = preferences2;
         externalfilesTypes.set(FXCollections.observableArrayList(ExternalFileTypes.getInstance().getExternalFileTypeSelection()));
         setValues(linkedFile);
     }
@@ -61,9 +63,9 @@ private void checkExtension() {
     public void openBrowseDialog() {
         String fileText = linkProperty().get();
 
-        Optional<Path> file = FileHelper.expandFilename(database, fileText, Globals.prefs.getFileDirectoryPreferences());
+        Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFileDirectoryPreferences());
 
-        Path workingDir = file.orElse(Paths.get(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)));
+        Path workingDir = file.orElse(Paths.get(preferences.get(JabRefPreferences.WORKING_DIRECTORY)));
         String fileName = Paths.get(fileText).getFileName().toString();
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
@@ -73,10 +75,10 @@ public void openBrowseDialog() {
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
             // Store the directory for next time:
-            Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, path.toString());
+            preferences.put(JabRefPreferences.WORKING_DIRECTORY, path.toString());
 
             // If the file is below the file directory, make the path relative:
-            List<Path> fileDirectories = database.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+            List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
             path = FileUtil.shortenFileName(path, fileDirectories);
 
             linkProperty().set(path.toString());
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 6ea1a9d56dc..2759b328528 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -2,6 +2,7 @@
 
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.model.metadata.FileDirectoryPreferences;
 
 public interface PreferencesService {
     JournalAbbreviationPreferences getJournalAbbreviationPreferences();
@@ -11,4 +12,10 @@ public interface PreferencesService {
     KeyBindingRepository getKeyBindingRepository();
 
     void storeJournalAbbreviationPreferences(JournalAbbreviationPreferences abbreviationsPreferences);
+
+    FileDirectoryPreferences getFileDirectoryPreferences();
+
+    String get(String key);
+
+    void put(String key, String value);
 }

From 39a10927e252e8a6b1b7426a7894fef3008a861d Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 19 Mar 2018 20:40:44 +0100
Subject: [PATCH 21/36] fix checkstyle remove unused parameter entry

---
 src/main/java/org/jabref/gui/BasePanel.java   | 185 +++++++++---------
 .../ExternalFileMenuItem.java                 |  19 +-
 .../gui/importer/ImportInspectionDialog.java  |   4 +-
 .../org/jabref/gui/maintable/MainTable.java   |   1 +
 .../jabref/gui/search/SearchResultFrame.java  |  16 +-
 5 files changed, 111 insertions(+), 114 deletions(-)

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index d72f5c0d716..0ae79e1c3a4 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -292,8 +292,8 @@ public String getTabTitle() {
             }
         } else if (databaseLocation == DatabaseLocation.SHARED) {
             title.append(
-                    this.bibDatabaseContext.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared")
-                            + "]");
+            this.bibDatabaseContext.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared")
+            + "]");
         }
 
         return title.toString();
@@ -386,8 +386,8 @@ public void init() {
 
                 if (entries.isEmpty()) { // None selected. Inform the user to select entries first.
                     dialogService.showWarningDialogAndWait(
-                            Localization.lang("Autogenerate BibTeX keys"),
-                            Localization.lang("First select the entries you want keys to be generated for."));
+                    Localization.lang("Autogenerate BibTeX keys"),
+                    Localization.lang("First select the entries you want keys to be generated for."));
                     return;
                 }
                 output(formatOutputMessage(Localization.lang("Generating BibTeX key for"), numSelected));
@@ -405,11 +405,11 @@ public void run() {
                     if (entries.parallelStream().anyMatch(BibEntry::hasCiteKey)) {
 
                         boolean overwriteKeysPressed = dialogService.showConfirmationDialogWithOptOutAndWait(Localization.lang("Overwrite keys"),
-                                Localization.lang("One or more keys will be overwritten. Continue?"),
-                                Localization.lang("Overwrite keys"),
-                                Localization.lang("Cancel"),
-                                Localization.lang("Disable this confirmation dialog"),
-                                optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, !optOut));
+                        Localization.lang("One or more keys will be overwritten. Continue?"),
+                        Localization.lang("Overwrite keys"),
+                        Localization.lang("Cancel"),
+                        Localization.lang("Disable this confirmation dialog"),
+                        optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, !optOut));
 
                         // The user doesn't want to overide cite keys
                         if (!overwriteKeysPressed) {
@@ -467,27 +467,26 @@ public void update() {
         actions.put(Actions.COPY_KEY_AND_TITLE, (BaseAction) () -> copyKeyAndTitle());
 
         actions.put(Actions.COPY_CITATION_ASCII_DOC,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.ASCII_DOC));
+        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.ASCII_DOC));
         actions.put(Actions.COPY_CITATION_XSLFO,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.XSL_FO));
+        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.XSL_FO));
         actions.put(Actions.COPY_CITATION_HTML,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.HTML));
+        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.HTML));
         actions.put(Actions.COPY_CITATION_RTF,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.RTF));
+        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.RTF));
         actions.put(Actions.COPY_CITATION_TEXT,
-                (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.TEXT));
+        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.TEXT));
 
         // The action for copying the BibTeX keys as hyperlinks to the urls of the selected entries
         actions.put(Actions.COPY_KEY_AND_LINK, new CopyBibTeXKeyAndLinkAction(mainTable));
 
         actions.put(Actions.MERGE_DATABASE, new AppendDatabaseAction(frame, this));
 
-
         actions.put(Actions.OPEN_EXTERNAL_FILE, (BaseAction) () -> openExternalFile());
 
         actions.put(Actions.OPEN_FOLDER, (BaseAction) () -> JabRefExecutorService.INSTANCE.execute(() -> {
             final List<Path> files = FileUtil.getListOfLinkedFiles(mainTable.getSelectedEntries(),
-                    bibDatabaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
+            bibDatabaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
             for (final Path f : files) {
                 try {
                     JabRefDesktop.openFolderAndSelectFile(f.toAbsolutePath());
@@ -498,12 +497,12 @@ public void update() {
         }));
 
         actions.put(Actions.OPEN_CONSOLE, (BaseAction) () -> JabRefDesktop
-                .openConsole(frame.getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null)));
+        .openConsole(frame.getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null)));
 
         actions.put(Actions.PULL_CHANGES_FROM_SHARED_DATABASE, (BaseAction) () -> {
             DatabaseSynchronizer dbmsSynchronizer = frame.getCurrentBasePanel()
-                    .getBibDatabaseContext()
-                    .getDBMSSynchronizer();
+            .getBibDatabaseContext()
+            .getDBMSSynchronizer();
             dbmsSynchronizer.pullChanges();
         });
 
@@ -530,7 +529,7 @@ public void update() {
             }
 
             output(Localization.lang("Replaced") + ' ' + counter + ' '
-                    + (counter == 1 ? Localization.lang("occurrence") : Localization.lang("occurrences")) + '.');
+            + (counter == 1 ? Localization.lang("occurrence") : Localization.lang("occurrences")) + '.');
             if (counter > 0) {
                 ce.end();
                 getUndoManager().addEdit(ce);
@@ -544,35 +543,35 @@ public void update() {
 
         // Note that we can't put the number of entries that have been reverted into the undoText as the concrete number cannot be injected
         actions.put(new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getCommand(),
-                new SpecialFieldViewModel(SpecialField.RELEVANCE, undoManager).getSpecialFieldAction(
-                        SpecialField.RELEVANCE.getValues().get(0), frame));
+        new SpecialFieldViewModel(SpecialField.RELEVANCE, undoManager).getSpecialFieldAction(
+        SpecialField.RELEVANCE.getValues().get(0), frame));
         actions.put(new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getCommand(),
-                new SpecialFieldViewModel(SpecialField.QUALITY, undoManager)
-                        .getSpecialFieldAction(SpecialField.QUALITY.getValues().get(0), frame));
+        new SpecialFieldViewModel(SpecialField.QUALITY, undoManager)
+        .getSpecialFieldAction(SpecialField.QUALITY.getValues().get(0), frame));
         actions.put(new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getCommand(),
-                new SpecialFieldViewModel(SpecialField.PRINTED, undoManager).getSpecialFieldAction(
-                        SpecialField.PRINTED.getValues().get(0), frame));
+        new SpecialFieldViewModel(SpecialField.PRINTED, undoManager).getSpecialFieldAction(
+        SpecialField.PRINTED.getValues().get(0), frame));
 
         for (SpecialFieldValue prio : SpecialField.PRIORITY.getValues()) {
             actions.put(new SpecialFieldValueViewModel(prio).getCommand(),
-                    new SpecialFieldViewModel(SpecialField.PRIORITY, undoManager).getSpecialFieldAction(prio, this.frame));
+            new SpecialFieldViewModel(SpecialField.PRIORITY, undoManager).getSpecialFieldAction(prio, this.frame));
         }
         for (SpecialFieldValue rank : SpecialField.RANKING.getValues()) {
             actions.put(new SpecialFieldValueViewModel(rank).getCommand(),
-                    new SpecialFieldViewModel(SpecialField.RANKING, undoManager).getSpecialFieldAction(rank, this.frame));
+            new SpecialFieldViewModel(SpecialField.RANKING, undoManager).getSpecialFieldAction(rank, this.frame));
         }
         for (SpecialFieldValue status : SpecialField.READ_STATUS.getValues()) {
             actions.put(new SpecialFieldValueViewModel(status).getCommand(),
-                    new SpecialFieldViewModel(SpecialField.READ_STATUS, undoManager).getSpecialFieldAction(status, this.frame));
+            new SpecialFieldViewModel(SpecialField.READ_STATUS, undoManager).getSpecialFieldAction(status, this.frame));
         }
 
         actions.put(Actions.TOGGLE_PREVIEW, (BaseAction) () -> {
             PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences();
             boolean enabled = !previewPreferences.isPreviewPanelEnabled();
             PreviewPreferences newPreviewPreferences = previewPreferences
-                    .getBuilder()
-                    .withPreviewPanelEnabled(enabled)
-                    .build();
+            .getBuilder()
+            .withPreviewPanelEnabled(enabled)
+            .build();
             Globals.prefs.storePreviewPreferences(newPreviewPreferences);
             DefaultTaskExecutor.runInJavaFXThread(() -> setPreviewActiveBasePanels(enabled));
         });
@@ -647,10 +646,10 @@ private void delete(boolean cut, List<BibEntry> entries) {
         NamedCompound compound;
         if (cut) {
             compound = new NamedCompound(
-                    (entries.size() > 1 ? Localization.lang("cut entries") : Localization.lang("cut entry")));
+            (entries.size() > 1 ? Localization.lang("cut entries") : Localization.lang("cut entry")));
         } else {
             compound = new NamedCompound(
-                    (entries.size() > 1 ? Localization.lang("delete entries") : Localization.lang("delete entry")));
+            (entries.size() > 1 ? Localization.lang("delete entries") : Localization.lang("delete entry")));
         }
         for (BibEntry entry : entries) {
             compound.addEdit(new UndoableRemoveEntry(bibDatabaseContext.getDatabase(), entry, BasePanel.this));
@@ -662,7 +661,7 @@ private void delete(boolean cut, List<BibEntry> entries) {
 
         markBaseChanged();
         frame.output(
-                formatOutputMessage(cut ? Localization.lang("Cut") : Localization.lang("Deleted"), entries.size()));
+        formatOutputMessage(cut ? Localization.lang("Cut") : Localization.lang("Deleted"), entries.size()));
 
         // prevent the main table from loosing focus
         mainTable.requestFocus();
@@ -677,9 +676,9 @@ private void copyTitle() {
         if (!selectedBibEntries.isEmpty()) {
             // Collect all non-null titles.
             List<String> titles = selectedBibEntries.stream()
-                    .filter(bibEntry -> bibEntry.getTitle().isPresent())
-                    .map(bibEntry -> bibEntry.getTitle().get())
-                    .collect(Collectors.toList());
+            .filter(bibEntry -> bibEntry.getTitle().isPresent())
+            .map(bibEntry -> bibEntry.getTitle().get())
+            .collect(Collectors.toList());
 
             if (titles.isEmpty()) {
                 output(Localization.lang("None of the selected entries have titles."));
@@ -691,11 +690,11 @@ private void copyTitle() {
             if (titles.size() == selectedBibEntries.size()) {
                 // All entries had titles.
                 output((selectedBibEntries.size() > 1 ? Localization.lang("Copied titles") : Localization
-                        .lang("Copied title")) + '.');
+                .lang("Copied title")) + '.');
             } else {
                 output(Localization.lang("Warning: %0 out of %1 entries have undefined title.",
-                        Integer.toString(selectedBibEntries.size() - titles.size()),
-                        Integer.toString(selectedBibEntries.size())));
+                Integer.toString(selectedBibEntries.size() - titles.size()),
+                Integer.toString(selectedBibEntries.size())));
             }
         }
     }
@@ -715,8 +714,8 @@ private void copyCiteKey() {
 
             String sb = String.join(",", keys);
             String citeCommand = Optional.ofNullable(Globals.prefs.get(JabRefPreferences.CITE_COMMAND))
-                    .filter(cite -> cite.contains("\\")) // must contain \
-                    .orElse("\\cite");
+            .filter(cite -> cite.contains("\\")) // must contain \
+            .orElse("\\cite");
             StringSelection ss = new StringSelection(citeCommand + "{" + sb + '}');
             Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss, BasePanel.this);
 
@@ -725,7 +724,7 @@ private void copyCiteKey() {
                 output(bes.size() > 1 ? Localization.lang("Copied keys") : Localization.lang("Copied key") + '.');
             } else {
                 output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.",
-                        Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
+                Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
             }
         }
     }
@@ -751,7 +750,7 @@ private void copyKey() {
                 output((bes.size() > 1 ? Localization.lang("Copied keys") : Localization.lang("Copied key")) + '.');
             } else {
                 output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.",
-                        Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
+                Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
             }
         }
     }
@@ -761,12 +760,12 @@ private void copyKeyAndTitle() {
         if (!bes.isEmpty()) {
             // OK: in a future version, this string should be configurable to allow arbitrary exports
             StringReader sr = new StringReader(
-                    "\\bibtexkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n");
+            "\\bibtexkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n");
             Layout layout;
             try {
                 layout = new LayoutHelper(sr,
-                        Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader))
-                                .getLayoutFromText();
+                Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader))
+                .getLayoutFromText();
             } catch (IOException e) {
                 LOGGER.info("Could not get layout", e);
                 return;
@@ -796,7 +795,7 @@ private void copyKeyAndTitle() {
                 output((bes.size() > 1 ? Localization.lang("Copied keys") : Localization.lang("Copied key")) + '.');
             } else {
                 output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.",
-                        Integer.toString(bes.size() - copied), Integer.toString(bes.size())));
+                Integer.toString(bes.size() - copied), Integer.toString(bes.size())));
             }
         }
     }
@@ -823,8 +822,8 @@ private void openExternalFile() {
                 return;
             }
             FileListEntry flEntry = fileListTableModel.getEntry(0);
-            ExternalFileMenuItem item = new ExternalFileMenuItem(frame(), entry, "", flEntry.getLink(),
-                    flEntry.getType().get().getIcon().getSmallIcon(), bibDatabaseContext, flEntry.getType());
+            ExternalFileMenuItem item = new ExternalFileMenuItem(frame(), "", flEntry.getLink(),
+            flEntry.getType().get().getIcon().getSmallIcon(), bibDatabaseContext, flEntry.getType());
             item.doClick();
         });
     }
@@ -854,15 +853,15 @@ public void runCommand(final Actions command) {
     }
 
     private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
-            SavePreferences.DatabaseSaveType saveType) throws SaveException {
+        SavePreferences.DatabaseSaveType saveType) throws SaveException {
         SaveSession session;
         final String SAVE_DATABASE = Localization.lang("Save library");
         try {
             SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs)
-                    .withEncoding(enc)
-                    .withSaveType(saveType);
+            .withEncoding(enc)
+            .withSaveType(saveType);
             BibtexDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(
-                    FileSaveSession::new);
+            FileSaveSession::new);
             if (selectedOnly) {
                 session = databaseWriter.savePartOfDatabase(bibDatabaseContext, mainTable.getSelectedEntries(), prefs);
             } else {
@@ -874,9 +873,9 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
         // FIXME: not sure if this is really thrown anywhere
         catch (UnsupportedCharsetException ex) {
             JOptionPane.showMessageDialog(null,
-                    Localization.lang("Could not save file.") + ' '
-                            + Localization.lang("Character encoding '%0' is not supported.", enc.displayName()),
-                    SAVE_DATABASE, JOptionPane.ERROR_MESSAGE);
+            Localization.lang("Could not save file.") + ' '
+            + Localization.lang("Character encoding '%0' is not supported.", enc.displayName()),
+            SAVE_DATABASE, JOptionPane.ERROR_MESSAGE);
             throw new SaveException("rt");
         } catch (SaveException ex) {
             if (ex.specificEntry()) {
@@ -888,32 +887,32 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
             }
 
             dialogService.showErrorDialogAndWait(
-                    SAVE_DATABASE,
-                    Localization.lang("Could not save file."),
-                    ex);
+            SAVE_DATABASE,
+            Localization.lang("Could not save file."),
+            ex);
             throw new SaveException("rt");
         }
 
         boolean commit = true;
         if (!session.getWriter().couldEncodeAll()) {
             FormBuilder builder = FormBuilder.create()
-                    .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref"));
+            .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref"));
             JTextArea ta = new JTextArea(session.getWriter().getProblemCharacters());
             ta.setEditable(false);
             builder.add(Localization.lang("The chosen encoding '%0' could not encode the following characters:",
-                    session.getEncoding().displayName())).xy(1, 1);
+            session.getEncoding().displayName())).xy(1, 1);
             builder.add(ta).xy(3, 1);
             builder.add(Localization.lang("What do you want to do?")).xy(1, 3);
             String tryDiff = Localization.lang("Try different encoding");
             int answer = JOptionPane.showOptionDialog(null, builder.getPanel(), SAVE_DATABASE,
-                    JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null,
-                    new String[] {Localization.lang("Save"), tryDiff, Localization.lang("Cancel")}, tryDiff);
+            JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null,
+            new String[] {Localization.lang("Save"), tryDiff, Localization.lang("Cancel")}, tryDiff);
 
             if (answer == JOptionPane.NO_OPTION) {
 
                 // The user wants to use another encoding.
                 Object choice = JOptionPane.showInputDialog(null, Localization.lang("Select encoding"), SAVE_DATABASE,
-                        JOptionPane.QUESTION_MESSAGE, null, Encodings.ENCODINGS_DISPLAYNAMES, enc);
+                JOptionPane.QUESTION_MESSAGE, null, Encodings.ENCODINGS_DISPLAYNAMES, enc);
                 if (choice == null) {
                     commit = false;
                 } else {
@@ -1051,12 +1050,12 @@ private void createMainTable() {
 
         // Update entry editor and preview according to selected entries
         mainTable.addSelectionListener(event -> mainTable.getSelectedEntries()
-                .stream()
-                .findFirst()
-                .ifPresent(entry -> {
-                    preview.setEntry(entry);
-                    entryEditor.setEntry(entry);
-                }));
+        .stream()
+        .findFirst()
+        .ifPresent(entry -> {
+            preview.setEntry(entry);
+            entryEditor.setEntry(entry);
+        }));
 
         // TODO: Register these actions globally
         /*
@@ -1184,8 +1183,8 @@ public void setupMainPanel() {
         // Saves the divider position as soon as it changes
         // We need to keep a reference to the subscription, otherwise the binding gets garbage collected
         dividerPositionSubscription = EasyBind.monadic(Bindings.valueAt(splitPane.getDividers(), 0))
-                .flatMap(SplitPane.Divider::positionProperty)
-                .subscribe((observable, oldValue, newValue) -> saveDividerLocation(newValue));
+        .flatMap(SplitPane.Divider::positionProperty)
+        .subscribe((observable, oldValue, newValue) -> saveDividerLocation(newValue));
     }
 
     /**
@@ -1318,9 +1317,9 @@ public void previousPreviewStyle() {
 
     private void cyclePreview(int newPosition) {
         PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences()
-                .getBuilder()
-                .withPreviewCyclePosition(newPosition)
-                .build();
+        .getBuilder()
+        .withPreviewCyclePosition(newPosition)
+        .build();
         Globals.prefs.storePreviewPreferences(previewPreferences);
 
         preview.updateLayout(previewPreferences);
@@ -1394,7 +1393,7 @@ public void entryEditorClosing(EntryEditor editor) {
      */
     public void ensureNotShowingBottomPanel(BibEntry entry) {
         if (((mode == BasePanelMode.SHOWING_EDITOR) && (entryEditor.getEntry() == entry))
-                || ((mode == BasePanelMode.SHOWING_PREVIEW) && (preview.getEntry() == entry))) {
+        || ((mode == BasePanelMode.SHOWING_PREVIEW) && (preview.getEntry() == entry))) {
             closeBottomPane();
         }
     }
@@ -1508,9 +1507,9 @@ public boolean showDeleteConfirmationDialog(int numberOfEntries) {
             }
 
             return dialogService.showConfirmationDialogWithOptOutAndWait(title, message,
-                    okButton, cancelButton,
-                    Localization.lang("Disable this confirmation dialog"),
-                    optOut -> Globals.prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, !optOut));
+            okButton, cancelButton,
+            Localization.lang("Disable this confirmation dialog"),
+            optOut -> Globals.prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, !optOut));
         } else {
             return true;
         }
@@ -1550,9 +1549,9 @@ private void saveDividerLocation(Number position) {
 
         if (mode == BasePanelMode.SHOWING_PREVIEW) {
             PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences()
-                    .getBuilder()
-                    .withPreviewPanelDividerPosition(position)
-                    .build();
+            .getBuilder()
+            .withPreviewPanelDividerPosition(position)
+            .build();
             Globals.prefs.storePreviewPreferences(previewPreferences);
         } else if (mode == BasePanelMode.SHOWING_EDITOR) {
             preferences.setEntryEditorDividerPosition(position.doubleValue());
@@ -1628,7 +1627,7 @@ private BibEntry getShowing() {
 
     public String formatOutputMessage(String start, int count) {
         return String.format("%s %d %s.", start, count,
-                (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
+        (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
     }
 
     /**
@@ -1857,10 +1856,10 @@ public void action() {
                     List<LinkedFile> files = bes.get(0).getFiles();
 
                     Optional<LinkedFile> linkedFile = files.stream()
-                            .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
-                                    || FieldName.PS.equalsIgnoreCase(file.getFileType())
-                                    || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
-                            .findFirst();
+                    .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
+                    || FieldName.PS.equalsIgnoreCase(file.getFileType())
+                    || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
+                    .findFirst();
 
                     if (linkedFile.isPresent()) {
 
@@ -1919,10 +1918,10 @@ public SaveSelectedAction(SavePreferences.DatabaseSaveType saveType) {
         @Override
         public void action() throws SaveException {
             FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .withDefaultExtension(FileType.BIBTEX_DB)
-                    .addExtensionFilter(FileType.BIBTEX_DB)
-                    .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                    .build();
+            .withDefaultExtension(FileType.BIBTEX_DB)
+            .addExtensionFilter(FileType.BIBTEX_DB)
+            .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+            .build();
 
             Optional<Path> chosenFile = dialogService.showFileSaveDialog(fileDialogConfiguration);
             if (chosenFile.isPresent()) {
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
index 264a8829a2a..e636858d6e9 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
@@ -7,12 +7,12 @@
 
 import javax.swing.Icon;
 import javax.swing.JMenuItem;
+
 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;
@@ -27,27 +27,25 @@ 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,
+    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,
+    public ExternalFileMenuItem(JabRefFrame frame, String name, String link, Icon icon,
                                 BibDatabaseContext databaseContext, String fieldName) {
-        this(frame, entry, name, link, icon, databaseContext, Optional.empty());
+        this(frame, name, link, icon, databaseContext, Optional.empty());
         this.fieldName = fieldName;
     }
 
@@ -84,13 +82,12 @@ private boolean openLink() {
             // 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())));
+                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())));
 
                 return false;
             }
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index bc35fdb9e44..eef31a544d6 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -972,7 +972,7 @@ public void mouseClicked(MouseEvent e) {
                             return;
                         }
                         FileListEntry fl = tableModel.getEntry(0);
-                        (new ExternalFileMenuItem(frame, entry, "", fl.getLink(), null, panel.getBibDatabaseContext(),
+                        (new ExternalFileMenuItem(frame, "", fl.getLink(), null, panel.getBibDatabaseContext(),
                                 fl.getType())).actionPerformed(null);
                     }
                 } else { // Must be URL_COL
@@ -1030,7 +1030,7 @@ private void showFileFieldMenu(MouseEvent e) {
                 if ((description == null) || (description.trim().isEmpty())) {
                     description = flEntry.getLink();
                 }
-                menu.add(new ExternalFileMenuItem(panel.frame(), entry, description, flEntry.getLink(),
+                menu.add(new ExternalFileMenuItem(panel.frame(), description, flEntry.getLink(),
                         flEntry.getType().get().getIcon().getSmallIcon(), panel.getBibDatabaseContext(), flEntry.getType()));
                 count++;
             }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 0e7b331c2d2..556d95f4b52 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -219,6 +219,7 @@ private void handleOnDragEntered(TableRow<BibEntryTableViewModel> row, BibEntryT
         // Support the following gesture to select entries: click on one row -> hold mouse button -> move over other rows
         // We need to select all items between the starting row and the row where the user currently hovers the mouse over
         // It is not enough to just select the currently hovered row since then sometimes rows are not marked selected if the user moves to fast
+        @SuppressWarnings("unchecked")
         TableRow<BibEntryTableViewModel> sourceRow = (TableRow<BibEntryTableViewModel>) event.getGestureSource();
         getSelectionModel().selectRange(sourceRow.getIndex(), row.getIndex());
     }
diff --git a/src/main/java/org/jabref/gui/search/SearchResultFrame.java b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
index 0a781b36d54..bad13ad15ae 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultFrame.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
@@ -109,8 +109,8 @@ public class SearchResultFrame {
     private JTable entryTable;
     private PreviewPanel preview;
 
-    private SearchQuery searchQuery;
-    private boolean globalSearch;
+    private final SearchQuery searchQuery;
+    private final boolean globalSearch;
 
 
     public SearchResultFrame(JabRefFrame frame, String title, SearchQuery searchQuery, boolean globalSearch) {
@@ -293,7 +293,7 @@ public void selectLastEntry() {
     }
 
     public void selectPreviousEntry() {
-        selectEntry((entryTable.getSelectedRow() - 1 + entryTable.getRowCount()) % entryTable.getRowCount());
+        selectEntry(((entryTable.getSelectedRow() - 1) + entryTable.getRowCount()) % entryTable.getRowCount());
     }
 
     public void selectNextEntry() {
@@ -301,7 +301,7 @@ public void selectNextEntry() {
     }
 
     public void selectEntry(int index) {
-        if (index >= 0 && index < entryTable.getRowCount()) {
+        if ((index >= 0) && (index < entryTable.getRowCount())) {
             entryTable.changeSelection(index, 0, false, false);
         } else {
             contentPane.setDividerLocation(1.0f);
@@ -351,7 +351,7 @@ private void setupComparatorChooser(TableComparatorChooser<BibEntry> comparatorC
      */
     private void setWidths() {
         TableColumnModel cm = entryTable.getColumnModel();
-        for (int i = 0; i < PAD + FIELDS.length; i++) {
+        for (int i = 0; i < (PAD + FIELDS.length); i++) {
             switch (i) {
                 case FILE_COL:
                 case URL_COL:
@@ -393,7 +393,7 @@ private void addEntry(BibEntry entry, BasePanel panel) {
         entries.add(entry);
         entryHome.put(entry, panel);
 
-        if (preview.getEntry() == null || !preview.getBasePanel().isPresent()) {
+        if ((preview.getEntry() == null) || !preview.getBasePanel().isPresent()) {
             preview.setEntry(entry);
             preview.setBasePanel(panel);
             preview.setDatabaseContext(panel.getBibDatabaseContext());
@@ -475,7 +475,7 @@ public void mouseClicked(MouseEvent e) {
                             return;
                         }
                         FileListEntry fl = tableModel.getEntry(0);
-                        (new ExternalFileMenuItem(frame, entry, "", fl.getLink(), null,
+                            (new ExternalFileMenuItem(frame, "", fl.getLink(), null,
                                 p.getBibDatabaseContext(), fl.getType())).actionPerformed(null);
                     }
                     break;
@@ -518,7 +518,7 @@ public void processPopupTrigger(MouseEvent e) {
                     if ((description == null) || (description.trim().isEmpty())) {
                         description = flEntry.getLink();
                     }
-                    menu.add(new ExternalFileMenuItem(p.frame(), entry, description, flEntry.getLink(),
+                    menu.add(new ExternalFileMenuItem(p.frame(), description, flEntry.getLink(),
                             flEntry.getType().get().getIcon().getSmallIcon(), p.getBibDatabaseContext(), flEntry.getType()));
                     count++;
                 }

From 058aaf67c3e883f32b43634b7eecc9716bd78809 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 19 Mar 2018 20:47:53 +0100
Subject: [PATCH 22/36] fix checkstyle again

---
 src/main/java/org/jabref/gui/maintable/RightClickMenu.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index a4ec62a7385..01acda95c64 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -122,8 +122,6 @@ private static OldCommandWrapper mergeEntries(BasePanel panel) {
         return command;
     }
 
-
-
     private static OldCommandWrapper getFetchEntryData(BasePanel panel) {
         OldCommandWrapper command = new OldCommandWrapper(Actions.MERGE_WITH_FETCHED_ENTRY, panel);
         command.setExecutable(isAnyFieldSetForSelectedEntry(FetchAndMergeEntry.SUPPORTED_FIELDS, panel));

From 210d6454acdbd874bf358b402b30d008eae5f70a Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 19 Mar 2018 21:44:01 +0100
Subject: [PATCH 23/36] add changelog Move fxml to resources rework layout to
 grid

---
 CHANGELOG.md                                  |  1 +
 .../gui/filelist/LinkedFileEditDialog.fxml    | 49 -----------------
 .../gui/filelist/LinkedFileEditDialog.fxml    | 53 +++++++++++++++++++
 3 files changed, 54 insertions(+), 49 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
 create mode 100644 src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 980f0fac37c..37442367c48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ The new default removes the linked file from the entry instead of deleting the f
 - Pressing <kbd>ESC</kbd> while searching will clear the search field and select the first entry, if available, in the table. [koppor#293](https://github.com/koppor/jabref/issues/293)
 - We changed the metadata reading and writing. DublinCore is now the only metadata format, JabRef supports. (https://github.com/JabRef/jabref/pull/3710)
 - 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 improved the layout of the Edit file layout and made it resizable. We also tweaked the workflow for attaching files from the contextmenu, see https://github.com/JabRef/jabref/pull/3005
 
 ### Fixed
 - We fixed several performance problems with the management of journal abbreviations [#3323](https://github.com/JabRef/jabref/issues/3323)
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
deleted file mode 100644
index dcd13f30226..00000000000
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="100.0" xmlns="http://javafx.com/javafx/8.0.111"
-            fx:controller="org.jabref.gui.filelist.LinkedFileEditDialogController">
-   <content>
-       <VBox maxWidth="1.7976931348623157E308">
-           <HBox prefHeight="100.0" spacing="10.0">
-               <padding>
-                   <Insets top="10.0"/>
-               </padding>
-               <Label maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="95.0" text="%Link">
-                   <padding>
-                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                   </padding>
-               </Label>
-               <TextField fx:id="link" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity"/>
-               <Button minWidth="-Infinity" mnemonicParsing="false" onAction="#openBrowseDialog" text="%Browse"/>
-           </HBox>
-           <HBox layoutX="21.0" layoutY="21.0" prefHeight="100.0" spacing="10.0">
-               <Label minWidth="95.0" text="Description">
-                   <HBox.margin>
-                       <Insets/>
-                   </HBox.margin>
-                   <padding>
-                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                   </padding>
-               </Label>
-               <TextField fx:id="description" maxWidth="1.7976931348623157E308" minHeight="-Infinity"
-                          minWidth="-Infinity"/>
-           </HBox>
-           <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0">
-               <Label minWidth="95.0" text="%File type">
-                   <padding>
-                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                   </padding>
-               </Label>
-               <ComboBox fx:id="fileType"/>
-           </HBox>
-       </VBox>
-   </content>
-</DialogPane>
diff --git a/src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml b/src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
new file mode 100644
index 00000000000..4f4f9d3f057
--- /dev/null
+++ b/src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<DialogPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="150.0" prefWidth="536.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.LinkedFileEditDialogController">
+   <content>
+      <GridPane>
+        <columnConstraints>
+          <ColumnConstraints hgrow="NEVER" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="200.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="108.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+               <Label minWidth="95.0" text="%Link">
+                   <padding>
+                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                   </padding>
+               </Label>
+               <TextField fx:id="link" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
+               <Label text="Description" GridPane.rowIndex="1">
+                   <padding>
+                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                   </padding>
+               </Label>
+               <TextField fx:id="description" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
+            <ComboBox fx:id="fileType" minHeight="-Infinity" prefWidth="150.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2" />
+            <Button mnemonicParsing="false" onAction="#openBrowseDialog" text="%Browse" GridPane.columnIndex="2">
+               <GridPane.margin>
+                  <Insets left="10.0" />
+               </GridPane.margin>
+            </Button>
+            <Label text="Filetype" GridPane.rowIndex="2">
+               <padding>
+                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+               </padding>
+            </Label>
+         </children>
+      </GridPane>
+   </content>
+</DialogPane>

From ce8b9c2541c28b366145327dc1cc6da748e50f03 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Tue, 20 Mar 2018 15:40:23 +0100
Subject: [PATCH 24/36] adjust indentation

---
 src/main/java/org/jabref/gui/BasePanel.java | 214 +++++++++-----------
 1 file changed, 92 insertions(+), 122 deletions(-)

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 0ae79e1c3a4..9f017d2fa6b 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -291,9 +291,7 @@ public String getTabTitle() {
                 }
             }
         } else if (databaseLocation == DatabaseLocation.SHARED) {
-            title.append(
-            this.bibDatabaseContext.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared")
-            + "]");
+            title.append(this.bibDatabaseContext.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]");
         }
 
         return title.toString();
@@ -385,9 +383,8 @@ public void init() {
                 numSelected = entries.size();
 
                 if (entries.isEmpty()) { // None selected. Inform the user to select entries first.
-                    dialogService.showWarningDialogAndWait(
-                    Localization.lang("Autogenerate BibTeX keys"),
-                    Localization.lang("First select the entries you want keys to be generated for."));
+                    dialogService.showWarningDialogAndWait(Localization.lang("Autogenerate BibTeX keys"),
+                                                           Localization.lang("First select the entries you want keys to be generated for."));
                     return;
                 }
                 output(formatOutputMessage(Localization.lang("Generating BibTeX key for"), numSelected));
@@ -404,12 +401,13 @@ public void run() {
                 } else if (Globals.prefs.getBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY)) {
                     if (entries.parallelStream().anyMatch(BibEntry::hasCiteKey)) {
 
-                        boolean overwriteKeysPressed = dialogService.showConfirmationDialogWithOptOutAndWait(Localization.lang("Overwrite keys"),
-                        Localization.lang("One or more keys will be overwritten. Continue?"),
-                        Localization.lang("Overwrite keys"),
-                        Localization.lang("Cancel"),
-                        Localization.lang("Disable this confirmation dialog"),
-                        optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, !optOut));
+                        boolean overwriteKeysPressed = dialogService.showConfirmationDialogWithOptOutAndWait(
+                                                                                                             Localization.lang("Overwrite keys"),
+                                                                                                             Localization.lang("One or more keys will be overwritten. Continue?"),
+                                                                                                             Localization.lang("Overwrite keys"),
+                                                                                                             Localization.lang("Cancel"),
+                                                                                                             Localization.lang("Disable this confirmation dialog"),
+                                                                                                             optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, !optOut));
 
                         // The user doesn't want to overide cite keys
                         if (!overwriteKeysPressed) {
@@ -466,16 +464,11 @@ public void update() {
         // The action for copying the BibTeX key and the title for the first selected entry
         actions.put(Actions.COPY_KEY_AND_TITLE, (BaseAction) () -> copyKeyAndTitle());
 
-        actions.put(Actions.COPY_CITATION_ASCII_DOC,
-        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.ASCII_DOC));
-        actions.put(Actions.COPY_CITATION_XSLFO,
-        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.XSL_FO));
-        actions.put(Actions.COPY_CITATION_HTML,
-        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.HTML));
-        actions.put(Actions.COPY_CITATION_RTF,
-        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.RTF));
-        actions.put(Actions.COPY_CITATION_TEXT,
-        (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.TEXT));
+        actions.put(Actions.COPY_CITATION_ASCII_DOC, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.ASCII_DOC));
+        actions.put(Actions.COPY_CITATION_XSLFO, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.XSL_FO));
+        actions.put(Actions.COPY_CITATION_HTML, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.HTML));
+        actions.put(Actions.COPY_CITATION_RTF, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.RTF));
+        actions.put(Actions.COPY_CITATION_TEXT, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.TEXT));
 
         // The action for copying the BibTeX keys as hyperlinks to the urls of the selected entries
         actions.put(Actions.COPY_KEY_AND_LINK, new CopyBibTeXKeyAndLinkAction(mainTable));
@@ -485,8 +478,7 @@ public void update() {
         actions.put(Actions.OPEN_EXTERNAL_FILE, (BaseAction) () -> openExternalFile());
 
         actions.put(Actions.OPEN_FOLDER, (BaseAction) () -> JabRefExecutorService.INSTANCE.execute(() -> {
-            final List<Path> files = FileUtil.getListOfLinkedFiles(mainTable.getSelectedEntries(),
-            bibDatabaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
+            final List<Path> files = FileUtil.getListOfLinkedFiles(mainTable.getSelectedEntries(), bibDatabaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
             for (final Path f : files) {
                 try {
                     JabRefDesktop.openFolderAndSelectFile(f.toAbsolutePath());
@@ -497,12 +489,12 @@ public void update() {
         }));
 
         actions.put(Actions.OPEN_CONSOLE, (BaseAction) () -> JabRefDesktop
-        .openConsole(frame.getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null)));
+                                                                          .openConsole(frame.getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null)));
 
         actions.put(Actions.PULL_CHANGES_FROM_SHARED_DATABASE, (BaseAction) () -> {
             DatabaseSynchronizer dbmsSynchronizer = frame.getCurrentBasePanel()
-            .getBibDatabaseContext()
-            .getDBMSSynchronizer();
+                                                         .getBibDatabaseContext()
+                                                         .getDBMSSynchronizer();
             dbmsSynchronizer.pullChanges();
         });
 
@@ -529,7 +521,7 @@ public void update() {
             }
 
             output(Localization.lang("Replaced") + ' ' + counter + ' '
-            + (counter == 1 ? Localization.lang("occurrence") : Localization.lang("occurrences")) + '.');
+                    + (counter == 1 ? Localization.lang("occurrence") : Localization.lang("occurrences")) + '.');
             if (counter > 0) {
                 ce.end();
                 getUndoManager().addEdit(ce);
@@ -543,35 +535,33 @@ public void update() {
 
         // Note that we can't put the number of entries that have been reverted into the undoText as the concrete number cannot be injected
         actions.put(new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getCommand(),
-        new SpecialFieldViewModel(SpecialField.RELEVANCE, undoManager).getSpecialFieldAction(
-        SpecialField.RELEVANCE.getValues().get(0), frame));
+                    new SpecialFieldViewModel(SpecialField.RELEVANCE, undoManager).getSpecialFieldAction(SpecialField.RELEVANCE.getValues().get(0), frame));
+
         actions.put(new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getCommand(),
-        new SpecialFieldViewModel(SpecialField.QUALITY, undoManager)
-        .getSpecialFieldAction(SpecialField.QUALITY.getValues().get(0), frame));
+                    new SpecialFieldViewModel(SpecialField.QUALITY, undoManager).getSpecialFieldAction(SpecialField.QUALITY.getValues().get(0), frame));
+
         actions.put(new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getCommand(),
-        new SpecialFieldViewModel(SpecialField.PRINTED, undoManager).getSpecialFieldAction(
-        SpecialField.PRINTED.getValues().get(0), frame));
+                    new SpecialFieldViewModel(SpecialField.PRINTED, undoManager).getSpecialFieldAction(SpecialField.PRINTED.getValues().get(0), frame));
 
         for (SpecialFieldValue prio : SpecialField.PRIORITY.getValues()) {
             actions.put(new SpecialFieldValueViewModel(prio).getCommand(),
-            new SpecialFieldViewModel(SpecialField.PRIORITY, undoManager).getSpecialFieldAction(prio, this.frame));
+                        new SpecialFieldViewModel(SpecialField.PRIORITY, undoManager).getSpecialFieldAction(prio, this.frame));
         }
         for (SpecialFieldValue rank : SpecialField.RANKING.getValues()) {
             actions.put(new SpecialFieldValueViewModel(rank).getCommand(),
-            new SpecialFieldViewModel(SpecialField.RANKING, undoManager).getSpecialFieldAction(rank, this.frame));
+                        new SpecialFieldViewModel(SpecialField.RANKING, undoManager).getSpecialFieldAction(rank, this.frame));
         }
         for (SpecialFieldValue status : SpecialField.READ_STATUS.getValues()) {
             actions.put(new SpecialFieldValueViewModel(status).getCommand(),
-            new SpecialFieldViewModel(SpecialField.READ_STATUS, undoManager).getSpecialFieldAction(status, this.frame));
+                        new SpecialFieldViewModel(SpecialField.READ_STATUS, undoManager).getSpecialFieldAction(status, this.frame));
         }
 
         actions.put(Actions.TOGGLE_PREVIEW, (BaseAction) () -> {
             PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences();
             boolean enabled = !previewPreferences.isPreviewPanelEnabled();
-            PreviewPreferences newPreviewPreferences = previewPreferences
-            .getBuilder()
-            .withPreviewPanelEnabled(enabled)
-            .build();
+            PreviewPreferences newPreviewPreferences = previewPreferences.getBuilder()
+                                                                         .withPreviewPanelEnabled(enabled)
+                                                                         .build();
             Globals.prefs.storePreviewPreferences(newPreviewPreferences);
             DefaultTaskExecutor.runInJavaFXThread(() -> setPreviewActiveBasePanels(enabled));
         });
@@ -645,11 +635,9 @@ private void delete(boolean cut, List<BibEntry> entries) {
 
         NamedCompound compound;
         if (cut) {
-            compound = new NamedCompound(
-            (entries.size() > 1 ? Localization.lang("cut entries") : Localization.lang("cut entry")));
+            compound = new NamedCompound((entries.size() > 1 ? Localization.lang("cut entries") : Localization.lang("cut entry")));
         } else {
-            compound = new NamedCompound(
-            (entries.size() > 1 ? Localization.lang("delete entries") : Localization.lang("delete entry")));
+            compound = new NamedCompound((entries.size() > 1 ? Localization.lang("delete entries") : Localization.lang("delete entry")));
         }
         for (BibEntry entry : entries) {
             compound.addEdit(new UndoableRemoveEntry(bibDatabaseContext.getDatabase(), entry, BasePanel.this));
@@ -660,8 +648,7 @@ private void delete(boolean cut, List<BibEntry> entries) {
         getUndoManager().addEdit(compound);
 
         markBaseChanged();
-        frame.output(
-        formatOutputMessage(cut ? Localization.lang("Cut") : Localization.lang("Deleted"), entries.size()));
+        frame.output(formatOutputMessage(cut ? Localization.lang("Cut") : Localization.lang("Deleted"), entries.size()));
 
         // prevent the main table from loosing focus
         mainTable.requestFocus();
@@ -676,9 +663,9 @@ private void copyTitle() {
         if (!selectedBibEntries.isEmpty()) {
             // Collect all non-null titles.
             List<String> titles = selectedBibEntries.stream()
-            .filter(bibEntry -> bibEntry.getTitle().isPresent())
-            .map(bibEntry -> bibEntry.getTitle().get())
-            .collect(Collectors.toList());
+                                                    .filter(bibEntry -> bibEntry.getTitle().isPresent())
+                                                    .map(bibEntry -> bibEntry.getTitle().get())
+                                                    .collect(Collectors.toList());
 
             if (titles.isEmpty()) {
                 output(Localization.lang("None of the selected entries have titles."));
@@ -689,12 +676,9 @@ private void copyTitle() {
 
             if (titles.size() == selectedBibEntries.size()) {
                 // All entries had titles.
-                output((selectedBibEntries.size() > 1 ? Localization.lang("Copied titles") : Localization
-                .lang("Copied title")) + '.');
+                output((selectedBibEntries.size() > 1 ? Localization.lang("Copied titles") : Localization.lang("Copied title")) + '.');
             } else {
-                output(Localization.lang("Warning: %0 out of %1 entries have undefined title.",
-                Integer.toString(selectedBibEntries.size() - titles.size()),
-                Integer.toString(selectedBibEntries.size())));
+                output(Localization.lang("Warning: %0 out of %1 entries have undefined title.", Integer.toString(selectedBibEntries.size() - titles.size()), Integer.toString(selectedBibEntries.size())));
             }
         }
     }
@@ -714,8 +698,8 @@ private void copyCiteKey() {
 
             String sb = String.join(",", keys);
             String citeCommand = Optional.ofNullable(Globals.prefs.get(JabRefPreferences.CITE_COMMAND))
-            .filter(cite -> cite.contains("\\")) // must contain \
-            .orElse("\\cite");
+                                         .filter(cite -> cite.contains("\\")) // must contain \
+                                         .orElse("\\cite");
             StringSelection ss = new StringSelection(citeCommand + "{" + sb + '}');
             Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss, BasePanel.this);
 
@@ -723,8 +707,7 @@ private void copyCiteKey() {
                 // All entries had keys.
                 output(bes.size() > 1 ? Localization.lang("Copied keys") : Localization.lang("Copied key") + '.');
             } else {
-                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.",
-                Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
+                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
             }
         }
     }
@@ -749,8 +732,7 @@ private void copyKey() {
                 // All entries had keys.
                 output((bes.size() > 1 ? Localization.lang("Copied keys") : Localization.lang("Copied key")) + '.');
             } else {
-                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.",
-                Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
+                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", Integer.toString(bes.size() - keys.size()), Integer.toString(bes.size())));
             }
         }
     }
@@ -759,13 +741,11 @@ private void copyKeyAndTitle() {
         List<BibEntry> bes = mainTable.getSelectedEntries();
         if (!bes.isEmpty()) {
             // OK: in a future version, this string should be configurable to allow arbitrary exports
-            StringReader sr = new StringReader(
-            "\\bibtexkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n");
+            StringReader sr = new StringReader("\\bibtexkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n");
             Layout layout;
             try {
-                layout = new LayoutHelper(sr,
-                Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader))
-                .getLayoutFromText();
+                layout = new LayoutHelper(sr, Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader))
+                                                                                                                             .getLayoutFromText();
             } catch (IOException e) {
                 LOGGER.info("Could not get layout", e);
                 return;
@@ -794,8 +774,7 @@ private void copyKeyAndTitle() {
                 // All entries had keys.
                 output((bes.size() > 1 ? Localization.lang("Copied keys") : Localization.lang("Copied key")) + '.');
             } else {
-                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.",
-                Integer.toString(bes.size() - copied), Integer.toString(bes.size())));
+                output(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", Integer.toString(bes.size() - copied), Integer.toString(bes.size())));
             }
         }
     }
@@ -822,8 +801,7 @@ private void openExternalFile() {
                 return;
             }
             FileListEntry flEntry = fileListTableModel.getEntry(0);
-            ExternalFileMenuItem item = new ExternalFileMenuItem(frame(), "", flEntry.getLink(),
-            flEntry.getType().get().getIcon().getSmallIcon(), bibDatabaseContext, flEntry.getType());
+            ExternalFileMenuItem item = new ExternalFileMenuItem(frame(), "", flEntry.getLink(), flEntry.getType().get().getIcon().getSmallIcon(), bibDatabaseContext, flEntry.getType());
             item.doClick();
         });
     }
@@ -852,16 +830,14 @@ public void runCommand(final Actions command) {
         }
     }
 
-    private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
-        SavePreferences.DatabaseSaveType saveType) throws SaveException {
+    private boolean saveDatabase(File file, boolean selectedOnly, Charset enc, SavePreferences.DatabaseSaveType saveType) throws SaveException {
         SaveSession session;
         final String SAVE_DATABASE = Localization.lang("Save library");
         try {
             SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs)
-            .withEncoding(enc)
-            .withSaveType(saveType);
-            BibtexDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(
-            FileSaveSession::new);
+                                                   .withEncoding(enc)
+                                                   .withSaveType(saveType);
+            BibtexDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new);
             if (selectedOnly) {
                 session = databaseWriter.savePartOfDatabase(bibDatabaseContext, mainTable.getSelectedEntries(), prefs);
             } else {
@@ -872,10 +848,8 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
         }
         // FIXME: not sure if this is really thrown anywhere
         catch (UnsupportedCharsetException ex) {
-            JOptionPane.showMessageDialog(null,
-            Localization.lang("Could not save file.") + ' '
-            + Localization.lang("Character encoding '%0' is not supported.", enc.displayName()),
-            SAVE_DATABASE, JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, Localization.lang("Could not save file.") + ' '
+                    + Localization.lang("Character encoding '%0' is not supported.", enc.displayName()), SAVE_DATABASE, JOptionPane.ERROR_MESSAGE);
             throw new SaveException("rt");
         } catch (SaveException ex) {
             if (ex.specificEntry()) {
@@ -886,33 +860,26 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
                 LOGGER.warn("Could not save", ex);
             }
 
-            dialogService.showErrorDialogAndWait(
-            SAVE_DATABASE,
-            Localization.lang("Could not save file."),
-            ex);
+            dialogService.showErrorDialogAndWait(SAVE_DATABASE, Localization.lang("Could not save file."), ex);
             throw new SaveException("rt");
         }
 
         boolean commit = true;
         if (!session.getWriter().couldEncodeAll()) {
             FormBuilder builder = FormBuilder.create()
-            .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref"));
+                                             .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref"));
             JTextArea ta = new JTextArea(session.getWriter().getProblemCharacters());
             ta.setEditable(false);
-            builder.add(Localization.lang("The chosen encoding '%0' could not encode the following characters:",
-            session.getEncoding().displayName())).xy(1, 1);
+            builder.add(Localization.lang("The chosen encoding '%0' could not encode the following characters:", session.getEncoding().displayName())).xy(1, 1);
             builder.add(ta).xy(3, 1);
             builder.add(Localization.lang("What do you want to do?")).xy(1, 3);
             String tryDiff = Localization.lang("Try different encoding");
-            int answer = JOptionPane.showOptionDialog(null, builder.getPanel(), SAVE_DATABASE,
-            JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null,
-            new String[] {Localization.lang("Save"), tryDiff, Localization.lang("Cancel")}, tryDiff);
+            int answer = JOptionPane.showOptionDialog(null, builder.getPanel(), SAVE_DATABASE, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, new String[] {Localization.lang("Save"), tryDiff, Localization.lang("Cancel")}, tryDiff);
 
             if (answer == JOptionPane.NO_OPTION) {
 
                 // The user wants to use another encoding.
-                Object choice = JOptionPane.showInputDialog(null, Localization.lang("Select encoding"), SAVE_DATABASE,
-                JOptionPane.QUESTION_MESSAGE, null, Encodings.ENCODINGS_DISPLAYNAMES, enc);
+                Object choice = JOptionPane.showInputDialog(null, Localization.lang("Select encoding"), SAVE_DATABASE, JOptionPane.QUESTION_MESSAGE, null, Encodings.ENCODINGS_DISPLAYNAMES, enc);
                 if (choice == null) {
                     commit = false;
                 } else {
@@ -1050,12 +1017,12 @@ private void createMainTable() {
 
         // Update entry editor and preview according to selected entries
         mainTable.addSelectionListener(event -> mainTable.getSelectedEntries()
-        .stream()
-        .findFirst()
-        .ifPresent(entry -> {
-            preview.setEntry(entry);
-            entryEditor.setEntry(entry);
-        }));
+                                                         .stream()
+                                                         .findFirst()
+                                                         .ifPresent(entry -> {
+                                                             preview.setEntry(entry);
+                                                             entryEditor.setEntry(entry);
+                                                         }));
 
         // TODO: Register these actions globally
         /*
@@ -1183,8 +1150,8 @@ public void setupMainPanel() {
         // Saves the divider position as soon as it changes
         // We need to keep a reference to the subscription, otherwise the binding gets garbage collected
         dividerPositionSubscription = EasyBind.monadic(Bindings.valueAt(splitPane.getDividers(), 0))
-        .flatMap(SplitPane.Divider::positionProperty)
-        .subscribe((observable, oldValue, newValue) -> saveDividerLocation(newValue));
+                                              .flatMap(SplitPane.Divider::positionProperty)
+                                              .subscribe((observable, oldValue, newValue) -> saveDividerLocation(newValue));
     }
 
     /**
@@ -1317,9 +1284,9 @@ public void previousPreviewStyle() {
 
     private void cyclePreview(int newPosition) {
         PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences()
-        .getBuilder()
-        .withPreviewCyclePosition(newPosition)
-        .build();
+                                                             .getBuilder()
+                                                             .withPreviewCyclePosition(newPosition)
+                                                             .build();
         Globals.prefs.storePreviewPreferences(previewPreferences);
 
         preview.updateLayout(previewPreferences);
@@ -1393,7 +1360,7 @@ public void entryEditorClosing(EntryEditor editor) {
      */
     public void ensureNotShowingBottomPanel(BibEntry entry) {
         if (((mode == BasePanelMode.SHOWING_EDITOR) && (entryEditor.getEntry() == entry))
-        || ((mode == BasePanelMode.SHOWING_PREVIEW) && (preview.getEntry() == entry))) {
+                || ((mode == BasePanelMode.SHOWING_PREVIEW) && (preview.getEntry() == entry))) {
             closeBottomPane();
         }
     }
@@ -1506,10 +1473,12 @@ public boolean showDeleteConfirmationDialog(int numberOfEntries) {
                 cancelButton = Localization.lang("Keep entries");
             }
 
-            return dialogService.showConfirmationDialogWithOptOutAndWait(title, message,
-            okButton, cancelButton,
-            Localization.lang("Disable this confirmation dialog"),
-            optOut -> Globals.prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, !optOut));
+            return dialogService.showConfirmationDialogWithOptOutAndWait(title,
+                                                                         message,
+                                                                         okButton,
+                                                                         cancelButton,
+                                                                         Localization.lang("Disable this confirmation dialog"),
+                                                                         optOut -> Globals.prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, !optOut));
         } else {
             return true;
         }
@@ -1549,9 +1518,9 @@ private void saveDividerLocation(Number position) {
 
         if (mode == BasePanelMode.SHOWING_PREVIEW) {
             PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences()
-            .getBuilder()
-            .withPreviewPanelDividerPosition(position)
-            .build();
+                                                                 .getBuilder()
+                                                                 .withPreviewPanelDividerPosition(position)
+                                                                 .build();
             Globals.prefs.storePreviewPreferences(previewPreferences);
         } else if (mode == BasePanelMode.SHOWING_EDITOR) {
             preferences.setEntryEditorDividerPosition(position.doubleValue());
@@ -1626,8 +1595,7 @@ private BibEntry getShowing() {
     }
 
     public String formatOutputMessage(String start, int count) {
-        return String.format("%s %d %s.", start, count,
-        (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
+        return String.format("%s %d %s.", start, count, (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
     }
 
     /**
@@ -1856,16 +1824,18 @@ public void action() {
                     List<LinkedFile> files = bes.get(0).getFiles();
 
                     Optional<LinkedFile> linkedFile = files.stream()
-                    .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
-                    || FieldName.PS.equalsIgnoreCase(file.getFileType())
-                    || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
-                    .findFirst();
+                                                           .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
+                                                                   || FieldName.PS.equalsIgnoreCase(file.getFileType())
+                                                                   || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
+                                                           .findFirst();
 
                     if (linkedFile.isPresent()) {
 
                         try {
 
-                            JabRefDesktop.openExternalFileAnyFormat(bibDatabaseContext, linkedFile.get().getLink(), ExternalFileTypes.getInstance().fromLinkedFile(linkedFile.get(), true));
+                            JabRefDesktop.openExternalFileAnyFormat(bibDatabaseContext,
+                                                                    linkedFile.get().getLink(),
+                                                                    ExternalFileTypes.getInstance().fromLinkedFile(linkedFile.get(), true));
 
                             output(Localization.lang("External viewer called") + '.');
                         } catch (IOException e) {
@@ -1918,10 +1888,10 @@ public SaveSelectedAction(SavePreferences.DatabaseSaveType saveType) {
         @Override
         public void action() throws SaveException {
             FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-            .withDefaultExtension(FileType.BIBTEX_DB)
-            .addExtensionFilter(FileType.BIBTEX_DB)
-            .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-            .build();
+                                                                                                   .withDefaultExtension(FileType.BIBTEX_DB)
+                                                                                                   .addExtensionFilter(FileType.BIBTEX_DB)
+                                                                                                   .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                                   .build();
 
             Optional<Path> chosenFile = dialogService.showFileSaveDialog(fileDialogConfiguration);
             if (chosenFile.isPresent()) {

From b5816bcb51faf8df559dc1d1d58ae0657c8994dc Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 24 Mar 2018 17:12:25 +0100
Subject: [PATCH 25/36] convert to new FXML dialog model funcionality still
 some NPEs

---
 .../jabref/gui/AbstractReturnDialogView.java  | 19 ----
 .../org/jabref/gui/desktop/JabRefDesktop.java | 14 +--
 .../gui/fieldeditors/LinkedFileViewModel.java | 47 ++++-----
 .../jabref/gui/filelist/AttachFileAction.java | 17 ++--
 .../LinkedFileEditDialogController.java       | 43 --------
 .../filelist/LinkedFileEditDialogView.java    | 80 ++++++++++-----
 .../gui/importer/ImportInspectionDialog.java  | 98 +++++++++----------
 .../gui/openoffice/StyleSelectDialog.java     | 46 ++++-----
 .../protectedterms/ProtectedTermsDialog.java  | 15 +--
 .../gui/filelist/LinkedFileEditDialog.fxml    |  2 +-
 10 files changed, 158 insertions(+), 223 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/AbstractReturnDialogView.java
 delete mode 100644 src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java

diff --git a/src/main/java/org/jabref/gui/AbstractReturnDialogView.java b/src/main/java/org/jabref/gui/AbstractReturnDialogView.java
deleted file mode 100644
index 0386af11db7..00000000000
--- a/src/main/java/org/jabref/gui/AbstractReturnDialogView.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jabref.gui;
-
-import java.util.function.Function;
-
-/**
- * Dialog which returns a result of type {@link T}.
- */
-public abstract class AbstractReturnDialogView<T> extends AbstractView {
-
-    public AbstractReturnDialogView() {
-        super();
-    }
-
-    public AbstractReturnDialogView(Function<String, Object> injectionContext) {
-        super(injectionContext);
-    }
-
-    public abstract T showAndWait();
-}
diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index 9725b77933a..21c6e4ec424 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -15,25 +15,16 @@
 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;
@@ -83,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;
                 }
             }
@@ -167,7 +158,6 @@ private static void openExternalFilePlatformIndependent(Optional<ExternalFileTyp
         }
     }
 
-
     /**
      * Opens a file browser of the folder of the given file. If possible, the file is selected
      * @param fileLink the location of the file
@@ -210,7 +200,7 @@ public static void openBrowserShowPopup(String url) {
             JabRefGUI.getMainFrame().output(couldNotOpenBrowser);
             JOptionPane.showMessageDialog(null,
                                           couldNotOpenBrowser + "\n" + openManually + "\n" +
-                                              copiedToClipboard,
+                                                copiedToClipboard,
                                           couldNotOpenBrowser,
                                           JOptionPane.ERROR_MESSAGE);
         }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index b9d9b287a09..0be2eef2659 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -30,8 +30,9 @@
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.filelist.LinkedFileEditDialogView;
-import org.jabref.gui.filelist.LinkedFilesEditDialogViewModel;
 import org.jabref.gui.filelist.LinkedFilesWrapper;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.cleanup.MoveFilesCleanup;
@@ -214,9 +215,9 @@ public void rename() {
             String targetFileName = pdfCleanup.getTargetFileName(linkedFile, entry);
 
             boolean confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("Rename file"),
-            Localization.lang("Rename file to") + " " + targetFileName,
-            Localization.lang("Rename file"),
-            Localization.lang("Cancel"));
+                                                                          Localization.lang("Rename file to") + " " + targetFileName,
+                                                                          Localization.lang("Rename file"),
+                                                                          Localization.lang("Cancel"));
 
             if (confirm) {
                 Optional<Path> fileConflictCheck = pdfCleanup.findExistingFile(linkedFile, entry);
@@ -237,9 +238,9 @@ private void performRenameWithConflictCheck(Optional<Path> file, RenamePdfCleanu
             }
         } else {
             confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("File exists"),
-            Localization.lang("'%0' exists. Overwrite file?", targetFileName),
-            Localization.lang("Overwrite"),
-            Localization.lang("Cancel"));
+                                                                  Localization.lang("'%0' exists. Overwrite file?", targetFileName),
+                                                                  Localization.lang("Overwrite"),
+                                                                  Localization.lang("Cancel"));
 
             if (confirm) {
                 try {
@@ -247,7 +248,7 @@ private void performRenameWithConflictCheck(Optional<Path> file, RenamePdfCleanu
                     pdfCleanup.cleanupWithException(entry);
                 } catch (IOException e) {
                     dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"),
-                    Localization.lang("JabRef cannot access the file because it is being used by another process."));
+                                                         Localization.lang("JabRef cannot access the file because it is being used by another process."));
                 }
             }
         }
@@ -292,9 +293,9 @@ public boolean delete(FileDirectoryPreferences prefs) {
         ButtonType removeFromEntry = new ButtonType(Localization.lang("Remove from entry"), ButtonData.YES);
         ButtonType deleteFromEntry = new ButtonType(Localization.lang("Delete from disk"));
         Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
-        Localization.lang("Delete '%0'", file.get().toString()),
-        Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
-        removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
+                                                                                      Localization.lang("Delete '%0'", file.get().toString()),
+                                                                                      Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
+                                                                                      removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -315,17 +316,17 @@ public boolean delete(FileDirectoryPreferences prefs) {
     }
 
     public void edit() {
+
         LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
         wrapper.setLinkedFile(this.linkedFile);
         LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
-        if (dialog.showAndWait()) {
-            LinkedFilesEditDialogViewModel model = (LinkedFilesEditDialogViewModel) dialog.getController().get().getViewModel();
-            LinkedFile editedFile = model.getNewLinkedFile();
-            this.linkedFile.setLink(editedFile.getLink());
-            this.linkedFile.setDescription(editedFile.getDescription());
-            this.linkedFile.setFileType(editedFile.getFileType());
-        }
 
+        Optional<LinkedFile> editedFile = dialog.showAndWait();
+        editedFile.ifPresent(file -> {
+            this.linkedFile.setLink(file.getLink());
+            this.linkedFile.setDescription(file.getDescription());
+            this.linkedFile.setFileType(file.getFileType());
+        });
     }
 
     public void writeXMPMetadata() {
@@ -373,11 +374,11 @@ public void download() {
             Path destination = targetDirectory.get().resolve(suggestedName);
 
             BackgroundTask<Void> downloadTask = new FileDownloadTask(urlDownload.getSource(), destination)
-            .onSuccess(event -> {
-                LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences));
-                linkedFile.setLink(newLinkedFile.getLink());
-                linkedFile.setFileType(newLinkedFile.getFileType());
-            }).onFailure(ex -> dialogService.showErrorDialogAndWait("Download failed", ex));
+                                                                                                          .onSuccess(event -> {
+                                                                                                              LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences));
+                                                                                                              linkedFile.setLink(newLinkedFile.getLink());
+                                                                                                              linkedFile.setFileType(newLinkedFile.getFileType());
+                                                                                                          }).onFailure(ex -> dialogService.showErrorDialogAndWait("Download failed", ex));
 
             downloadProgress.bind(downloadTask.workDonePercentageProperty());
             taskExecutor.execute(downloadTask);
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index 6bd9005c72a..d26d041b963 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -34,8 +34,8 @@ public void execute() {
         BibEntry entry = panel.getSelectedEntries().get(0);
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-        .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-        .build();
+                                                                                               .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                               .build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
             LinkedFile newLinkedFile = new LinkedFile("", newFile.toString(), "");
@@ -44,20 +44,19 @@ public void execute() {
             wrapper.setLinkedFile(newLinkedFile);
             LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
 
-            boolean applyPressed = dialog.showAndWait();
-            if (applyPressed) {
-                LinkedFilesEditDialogViewModel model = (LinkedFilesEditDialogViewModel) dialog.getController().get().getViewModel();
-                newLinkedFile = model.getNewLinkedFile();
+            Optional<LinkedFile> editedLinkeDfile = dialog.showAndWait();
+            editedLinkeDfile.ifPresent(file -> {
 
-                Optional<FieldChange> fieldChange = entry.addFile(newLinkedFile);
+                Optional<FieldChange> fieldChange = entry.addFile(file);
 
                 if (fieldChange.isPresent()) {
                     UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE,
-                    entry.getField(FieldName.FILE).orElse(null), fieldChange.get().getNewValue());
+                                                                     entry.getField(FieldName.FILE).orElse(null),
+                                                                     fieldChange.get().getNewValue());
                     panel.getUndoManager().addEdit(ce);
                     panel.markBaseChanged();
                 }
-            }
+            });
         });
     }
 }
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
deleted file mode 100644
index 86067326bf6..00000000000
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogController.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.jabref.gui.filelist;
-
-import javax.inject.Inject;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.TextField;
-
-import org.jabref.gui.AbstractController;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
-import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.preferences.PreferencesService;
-
-public class LinkedFileEditDialogController extends AbstractController<LinkedFilesEditDialogViewModel> {
-
-
-    @FXML private TextField link;
-    @FXML private TextField description;
-    @FXML private ComboBox<ExternalFileType> fileType;
-
-    @Inject private DialogService dialogService;
-    @Inject private StateManager stateManager;
-    @Inject private LinkedFilesWrapper linkedFilesWrapper;
-
-    @Inject private PreferencesService preferences;
-
-    @FXML
-    private void initialize() {
-        viewModel = new LinkedFilesEditDialogViewModel(linkedFilesWrapper.getLinkedFile(), stateManager.getActiveDatabase().get(), dialogService, preferences);
-        fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
-        description.textProperty().bindBidirectional(viewModel.descriptionProperty());
-        link.textProperty().bindBidirectional(viewModel.linkProperty());
-        fileType.valueProperty().bindBidirectional(viewModel.getSelectedExternalFileType());
-    }
-
-    @FXML
-    private void openBrowseDialog(ActionEvent event) {
-        viewModel.openBrowseDialog();
-        link.requestFocus();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
index d5479dffd1d..0d3fb5ccc35 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
@@ -1,40 +1,66 @@
 package org.jabref.gui.filelist;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
+import javax.inject.Inject;
 
-import javafx.scene.control.Alert.AlertType;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
-import javafx.scene.control.DialogPane;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
 
-import org.jabref.gui.AbstractReturnDialogView;
-import org.jabref.gui.FXDialog;
-import org.jabref.logic.l10n.Localization;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.preferences.PreferencesService;
 
-public class LinkedFileEditDialogView extends AbstractReturnDialogView<Boolean> {
+import com.airhacks.afterburner.views.ViewLoader;
 
-    public LinkedFileEditDialogView(LinkedFilesWrapper linkedFile) {
-        super(createContext(linkedFile));
+public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
+
+
+    @FXML private TextField link;
+    @FXML private TextField description;
+    @FXML private ComboBox<ExternalFileType> fileType;
+
+    @Inject private DialogService dialogService;
+    @Inject private StateManager stateManager;
+
+    @Inject private PreferencesService preferences;
+    private final LinkedFilesEditDialogViewModel viewModel;
+
+    public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsContent(this.getDialogPane());
+
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
+
+        viewModel = new LinkedFilesEditDialogViewModel(wrapper.getLinkedFile(), stateManager.getActiveDatabase().get(), dialogService, preferences);
+
+        this.setResultConverter(button -> {
+            if (button == ButtonType.APPLY) {
+                return viewModel.getNewLinkedFile();
+            } else {
+                return null;
+            }
+        });
     }
 
-    private static Function<String, Object> createContext(LinkedFilesWrapper linkedFilesWrapper) {
-        Map<String, Object> context = new HashMap<>();
-        context.put("linkedFilesWrapper", linkedFilesWrapper);
-        return context::get;
+
+    @FXML
+    private void initialize() {
+        fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
+        description.textProperty().bindBidirectional(viewModel.descriptionProperty());
+        link.textProperty().bindBidirectional(viewModel.linkProperty());
+        fileType.valueProperty().bindBidirectional(viewModel.getSelectedExternalFileType());
     }
 
-    /**
-     * @return true if the user accepts the change
-     */
-    @Override
-    public Boolean showAndWait() {
-        FXDialog dialog = new FXDialog(AlertType.INFORMATION, Localization.lang("Edit linked file"));
-        dialog.setDialogPane((DialogPane) this.getView());
-        dialog.getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
-        dialog.setResizable(true);
-        Optional<ButtonType> buttonPressed = dialog.showAndWait();
-        return buttonPressed.equals(Optional.of(ButtonType.APPLY));
+    @FXML
+    private void openBrowseDialog(ActionEvent event) {
+        viewModel.openBrowseDialog();
+        link.requestFocus();
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index d53bed00041..620cfa2edeb 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -69,7 +69,6 @@
 import org.jabref.gui.filelist.FileListEntry;
 import org.jabref.gui.filelist.FileListTableModel;
 import org.jabref.gui.filelist.LinkedFileEditDialogView;
-import org.jabref.gui.filelist.LinkedFilesEditDialogViewModel;
 import org.jabref.gui.filelist.LinkedFilesWrapper;
 import org.jabref.gui.groups.GroupTreeNodeViewModel;
 import org.jabref.gui.groups.UndoableChangeEntriesOfGroup;
@@ -178,7 +177,7 @@ public class ImportInspectionDialog extends JabRefDialog implements ImportInspec
     private final PreviewPanel preview;
     private final Map<BibEntry, Set<GroupTreeNode>> groupAdditions = new HashMap<>();
     private final JCheckBox autoGenerate = new JCheckBox(Localization.lang("Generate keys"),
-            Globals.prefs.getBoolean(JabRefPreferences.GENERATE_KEYS_AFTER_INSPECTION));
+                                                         Globals.prefs.getBoolean(JabRefPreferences.GENERATE_KEYS_AFTER_INSPECTION));
     private final JLabel duplLabel = new JLabel(IconTheme.JabRefIcons.DUPLICATE.getSmallIcon());
     private final JLabel fileLabel = new JLabel(IconTheme.JabRefIcons.FILE.getSmallIcon());
     private final JLabel urlLabel = new JLabel(IconTheme.JabRefIcons.WWW.getSmallIcon());
@@ -208,7 +207,7 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoNam
 
         sortedList = new SortedList<>(entries);
         DefaultEventTableModel<BibEntry> tableModelGl = (DefaultEventTableModel<BibEntry>) GlazedListsSwing
-                .eventTableModelWithThreadProxyList(sortedList, new EntryTableFormat());
+                                                                                                           .eventTableModelWithThreadProxyList(sortedList, new EntryTableFormat());
         glTable = new EntryTable(tableModelGl);
         GeneralRenderer renderer = new GeneralRenderer(Color.white);
         glTable.setDefaultRenderer(JLabel.class, renderer);
@@ -218,11 +217,11 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoNam
         glTable.getActionMap().put("delete", deleteListener);
 
         selectionModel = (DefaultEventSelectionModel<BibEntry>) GlazedListsSwing
-                .eventSelectionModelWithThreadProxyList(sortedList);
+                                                                                .eventSelectionModelWithThreadProxyList(sortedList);
         glTable.setSelectionModel(selectionModel);
         selectionModel.getSelected().addListEventListener(new EntrySelectionListener());
         comparatorChooser = TableComparatorChooser.install(glTable, sortedList,
-                AbstractTableComparatorChooser.MULTIPLE_COLUMN_KEYBOARD);
+                                                           AbstractTableComparatorChooser.MULTIPLE_COLUMN_KEYBOARD);
         setupComparatorChooser();
         glTable.addMouseListener(new TableClickListener());
 
@@ -318,7 +317,7 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoNam
 
         // Remember and default to last size:
         setSize(new Dimension(Globals.prefs.getInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_WIDTH),
-                Globals.prefs.getInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_HEIGHT)));
+                              Globals.prefs.getInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_HEIGHT)));
         addWindowListener(new WindowAdapter() {
 
             @Override
@@ -382,8 +381,8 @@ public void addEntries(Collection<BibEntry> entriesToAdd) {
             // database (if
             // applicable) and against entries already in the table.
             if ((panel != null) && (DuplicateCheck
-                    .containsDuplicate(panel.getDatabase(), entry, panel.getBibDatabaseContext().getMode()).isPresent()
-                    || (internalDuplicate(this.entries, entry).isPresent()))) {
+                                                  .containsDuplicate(panel.getDatabase(), entry, panel.getBibDatabaseContext().getMode()).isPresent()
+                                    || (internalDuplicate(this.entries, entry).isPresent()))) {
                 entry.setGroupHit(true);
                 SwingUtilities.invokeLater(() -> deselectAllDuplicates.setEnabled(true));
             }
@@ -459,7 +458,7 @@ private void generateKeyForEntry(BibEntry entry) {
 
             // Generate a unique key:
             new BibtexKeyGenerator(localMetaData.getCiteKeyPattern(Globals.prefs.getBibtexKeyPatternPreferences().getKeyPattern()),
-                    database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
+                                   database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
             // Remove the entry from the database again, since we only added it in
             // order to
             // make sure the key was unique:
@@ -501,7 +500,7 @@ private void generateKeys() {
                 database.insertEntry(entry);
 
                 new BibtexKeyGenerator(localMetaData.getCiteKeyPattern(Globals.prefs.getBibtexKeyPatternPreferences().getKeyPattern()),
-                        database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
+                                       database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
                 // Add the generated key to our list:   -- TODO: Why??
                 keys.add(entry.getCiteKeyOptional());
             }
@@ -651,9 +650,9 @@ public void showMessage(String message) {
      */
     public void showErrorMessage(String fetcherTitle, String localizedException) {
         showMessage(Localization.lang("Error while fetching from %0", fetcherTitle) + "\n" +
-                Localization.lang("Please try again later and/or check your network connection.") + "\n" +
-                localizedException,
-                Localization.lang("Search %0", fetcherTitle), JOptionPane.ERROR_MESSAGE);
+                    Localization.lang("Please try again later and/or check your network connection.") + "\n" +
+                    localizedException,
+                    Localization.lang("Search %0", fetcherTitle), JOptionPane.ERROR_MESSAGE);
     }
 
     public JabRefFrame getFrame() {
@@ -733,11 +732,11 @@ public void actionPerformed(ActionEvent event) {
                     if (entry.isGroupHit()) {
 
                         boolean continuePressed = frame.getDialogService().showConfirmationDialogWithOptOutAndWait(Localization.lang("Duplicates found"),
-                                Localization.lang("There are possible duplicates (marked with an icon) that haven't been resolved. Continue?"),
-                                Localization.lang("Continue"),
-                                Localization.lang("Cancel"),
-                                Localization.lang("Disable this confirmation dialog"),
-                                optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, !optOut));
+                                                                                                                   Localization.lang("There are possible duplicates (marked with an icon) that haven't been resolved. Continue?"),
+                                                                                                                   Localization.lang("Continue"),
+                                                                                                                   Localization.lang("Cancel"),
+                                                                                                                   Localization.lang("Disable this confirmation dialog"),
+                                                                                                                   optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, !optOut));
 
                         if (!continuePressed) {
                             return;
@@ -836,9 +835,9 @@ private boolean addToGroups(NamedCompound ce, BibEntry entry, Set<GroupTreeNode>
                 // immediately.
 
                 boolean generateKeysPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Add to group"),
-                        Localization.lang("Cannot add entries to group without generating keys. Generate keys now?"),
-                        Localization.lang("Generate keys"),
-                        Localization.lang("Cancel"));
+                                                                                                     Localization.lang("Cannot add entries to group without generating keys. Generate keys now?"),
+                                                                                                     Localization.lang("Generate keys"),
+                                                                                                     Localization.lang("Cancel"));
 
                 if (generateKeysPressed) {
                     generateKeys();
@@ -856,7 +855,7 @@ private boolean addToGroups(NamedCompound ce, BibEntry entry, Set<GroupTreeNode>
                         List<FieldChange> undo = entryChanger.add(Collections.singletonList(entry));
                         if (!undo.isEmpty()) {
                             ce.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(new GroupTreeNodeViewModel(node),
-                                    undo));
+                                                                                    undo));
                         }
                     }
                 }
@@ -973,7 +972,7 @@ public void mouseClicked(MouseEvent e) {
                         }
                         FileListEntry fl = tableModel.getEntry(0);
                         (new ExternalFileMenuItem(frame, "", fl.getLink(), null, panel.getBibDatabaseContext(),
-                                fl.getType())).actionPerformed(null);
+                                                  fl.getType())).actionPerformed(null);
                     }
                 } else { // Must be URL_COL
                     openExternalLink(FieldName.URL, e);
@@ -1031,7 +1030,7 @@ private void showFileFieldMenu(MouseEvent e) {
                     description = flEntry.getLink();
                 }
                 menu.add(new ExternalFileMenuItem(panel.frame(), description, flEntry.getLink(),
-                        flEntry.getType().get().getIcon().getSmallIcon(), panel.getBibDatabaseContext(), flEntry.getType()));
+                                                  flEntry.getType().get().getIcon().getSmallIcon(), panel.getBibDatabaseContext(), flEntry.getType()));
                 count++;
             }
             if (count == 0) {
@@ -1085,12 +1084,12 @@ public void mousePressed(MouseEvent e) {
             if ((col == DUPL_COL) && (glTable.getValueAt(row, col) != null)) {
                 BibEntry first = sortedList.get(row);
                 Optional<BibEntry> other = DuplicateCheck.containsDuplicate(panel.getDatabase(), first,
-                        panel.getBibDatabaseContext().getMode());
+                                                                            panel.getBibDatabaseContext().getMode());
                 if (other.isPresent()) {
                     // This will be true if the duplicate is in the existing
                     // database.
                     DuplicateResolverDialog diag = new DuplicateResolverDialog(ImportInspectionDialog.this, other.get(),
-                            first, DuplicateResolverDialog.DuplicateResolverType.INSPECTION);
+                                                                               first, DuplicateResolverDialog.DuplicateResolverType.INSPECTION);
                     diag.setLocationRelativeTo(ImportInspectionDialog.this);
                     diag.setVisible(true);
                     ImportInspectionDialog.this.toFront();
@@ -1151,7 +1150,7 @@ public void mousePressed(MouseEvent e) {
                 other = internalDuplicate(entries, first);
                 if (other.isPresent()) {
                     DuplicateResolverDialog diag = new DuplicateResolverDialog(ImportInspectionDialog.this, first,
-                            other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH);
+                                                                               other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH);
                     diag.setLocationRelativeTo(ImportInspectionDialog.this);
                     diag.setVisible(true);
                     ImportInspectionDialog.this.toFront();
@@ -1225,9 +1224,9 @@ public void actionPerformed(ActionEvent actionEvent) {
             if (!entry.getCiteKeyOptional().isPresent()) {
 
                 boolean generateKeyPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Download file"),
-                        Localization.lang("This entry has no BibTeX key. Generate key now?"),
-                        Localization.lang("Generate key"),
-                        Localization.lang("Cancel"));
+                                                                                                    Localization.lang("This entry has no BibTeX key. Generate key now?"),
+                                                                                                    Localization.lang("Generate key"),
+                                                                                                    Localization.lang("Cancel"));
 
                 if (generateKeyPressed) {
                     generateKeyForEntry(entry);
@@ -1270,9 +1269,9 @@ public void actionPerformed(ActionEvent actionEvent) {
             if (!entry.hasCiteKey()) {
 
                 boolean generateKeyPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Download file"),
-                        Localization.lang("This entry has no BibTeX key. Generate key now?"),
-                        Localization.lang("Generate key"),
-                        Localization.lang("Cancel"));
+                                                                                                    Localization.lang("This entry has no BibTeX key. Generate key now?"),
+                                                                                                    Localization.lang("Generate key"),
+                                                                                                    Localization.lang("Cancel"));
 
                 if (generateKeyPressed) {
                     generateKeyForEntry(entry);
@@ -1286,18 +1285,18 @@ public void actionPerformed(ActionEvent actionEvent) {
             // links:
             JDialog diag = new JDialog(ImportInspectionDialog.this, true);
             JabRefExecutorService.INSTANCE
-                    .execute(AutoSetLinks.autoSetLinks(entry, bibDatabaseContext, e -> {
-                        if (e.getID() > 0) {
-
-                            entries.getReadWriteLock().writeLock().lock();
-                            try {
-                                entry.setField(FieldName.FILE, localModel.getStringRepresentation());
-                            } finally {
-                                entries.getReadWriteLock().writeLock().unlock();
-                            }
-                            glTable.repaint();
-                        }
-                    }, diag));
+                                          .execute(AutoSetLinks.autoSetLinks(entry, bibDatabaseContext, e -> {
+                                              if (e.getID() > 0) {
+
+                                                  entries.getReadWriteLock().writeLock().lock();
+                                                  try {
+                                                      entry.setField(FieldName.FILE, localModel.getStringRepresentation());
+                                                  } finally {
+                                                      entries.getReadWriteLock().writeLock().unlock();
+                                                  }
+                                                  glTable.repaint();
+                                              }
+                                          }, diag));
 
         }
     }
@@ -1323,13 +1322,8 @@ public void actionPerformed(ActionEvent actionEvent) {
             wrapper.setLinkedFile(linkedFile);
             LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
 
-            boolean applyPressed = DefaultTaskExecutor.runInJavaFXThread(() -> dialog.showAndWait());
-            if (applyPressed) {
-                LinkedFilesEditDialogViewModel model = (LinkedFilesEditDialogViewModel) dialog.getController().get().getViewModel();
-                linkedFile = model.getNewLinkedFile();
-                entry.addFile(linkedFile);
-            }
-
+            Optional<LinkedFile> editedLinkedFile = DefaultTaskExecutor.runInJavaFXThread(() -> dialog.showAndWait());
+            editedLinkedFile.ifPresent(file -> entry.addFile(linkedFile));
         }
 
         @Override
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
index 5723c35c3f0..b3dd612cd62 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
@@ -41,7 +41,6 @@
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -53,7 +52,6 @@
 import org.jabref.logic.openoffice.StyleLoader;
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.TestEntry;
-import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -146,9 +144,10 @@ private void init() {
 
         FormBuilder builder = FormBuilder.create();
         builder.layout(new FormLayout("fill:pref:grow, 4dlu, left:pref, 4dlu, left:pref",
-                "pref, 4dlu, 100dlu:grow, 4dlu, pref, 4dlu, fill:100dlu"));
-        builder.add(Localization.lang("Select one of the available styles or add a style file from disk.")).xyw(1, 1,
-                5);
+                                      "pref, 4dlu, 100dlu:grow, 4dlu, pref, 4dlu, fill:100dlu"));
+        builder.add(Localization.lang("Select one of the available styles or add a style file from disk.")).xyw(1,
+                                                                                                                1,
+                                                                                                                5);
         builder.add(new JScrollPane(table)).xyw(1, 3, 5);
         builder.add(addButton).xy(3, 5);
         builder.add(removeButton).xy(5, 5);
@@ -164,7 +163,7 @@ private void init() {
             public void actionPerformed(ActionEvent event) {
                 if ((table.getRowCount() == 0) || (table.getSelectedRowCount() == 0)) {
                     frame.getDialogService().showErrorDialogAndWait(Localization.lang("Style selection"),
-                            Localization.lang("You must select a valid style file."));
+                                                                    Localization.lang("You must select a valid style file."));
                     return;
                 }
                 okPressed = true;
@@ -201,7 +200,7 @@ public void actionPerformed(ActionEvent event) {
         diag.pack();
 
         WindowLocation pw = new WindowLocation(diag, JabRefPreferences.STYLES_POS_X, JabRefPreferences.STYLES_POS_Y,
-                JabRefPreferences.STYLES_SIZE_X, JabRefPreferences.STYLES_SIZE_Y);
+                                               JabRefPreferences.STYLES_SIZE_X, JabRefPreferences.STYLES_SIZE_Y);
         pw.displayWindowAtStoredLocation();
     }
 
@@ -210,7 +209,7 @@ private void setupTable() {
         EventList<OOBibStyle> sortedStyles = new SortedList<>(styles);
 
         tableModel = (DefaultEventTableModel<OOBibStyle>) GlazedListsSwing
-                .eventTableModelWithThreadProxyList(sortedStyles, new StyleTableFormat());
+                                                                          .eventTableModelWithThreadProxyList(sortedStyles, new StyleTableFormat());
         table = new JTable(tableModel);
         TableColumnModel cm = table.getColumnModel();
         cm.getColumn(0).setPreferredWidth(100);
@@ -218,7 +217,7 @@ private void setupTable() {
         cm.getColumn(2).setPreferredWidth(80);
 
         selectionModel = (DefaultEventSelectionModel<OOBibStyle>) GlazedListsSwing
-                .eventSelectionModelWithThreadProxyList(sortedStyles);
+                                                                                  .eventSelectionModelWithThreadProxyList(sortedStyles);
         table.setSelectionModel(selectionModel);
         table.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         table.addMouseListener(new MouseAdapter() {
@@ -252,12 +251,9 @@ private void setupPopupMenu() {
             Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt("jstyle");
             String link = style.getPath();
             try {
-                if (type.isPresent()) {
-                    JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), link, type);
-                } else {
-                    JabRefDesktop.openExternalFileUnknown(frame, new BibEntry(), new BibDatabaseContext(), link,
-                            new UnknownExternalFileType("jstyle"));
-                }
+
+                JabRefDesktop.openExternalFileAnyFormat(frame.getCurrentBasePanel().getDatabaseContext(), link, type);
+
             } catch (IOException e) {
                 LOGGER.warn("Problem open style file editor", e);
             }
@@ -270,9 +266,9 @@ private void setupPopupMenu() {
         removeAction = actionEvent -> getSelectedStyle().ifPresent(style -> {
 
             if (!style.isFromResource() && frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Remove style"),
-                    Localization.lang("Are you sure you want to remove the style?"),
-                    Localization.lang("Remove style"),
-                    Localization.lang("Cancel"))) {
+                                                                                                  Localization.lang("Are you sure you want to remove the style?"),
+                                                                                                  Localization.lang("Remove style"),
+                                                                                                  Localization.lang("Cancel"))) {
                 if (!loader.removeStyle(style)) {
                     LOGGER.info("Problem removing style");
                 }
@@ -470,14 +466,14 @@ public AddFileDialog() {
 
             JButton browse = new JButton(Localization.lang("Browse"));
             FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .addExtensionFilter(FileType.JSTYLE)
-                    .withDefaultExtension(FileType.JSTYLE)
-                    .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                    .build();
+                                                                                                   .addExtensionFilter(FileType.JSTYLE)
+                                                                                                   .withDefaultExtension(FileType.JSTYLE)
+                                                                                                   .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                                   .build();
 
             browse.addActionListener(e -> {
                 Optional<Path> file = DefaultTaskExecutor
-                        .runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
+                                                         .runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
                 file.ifPresent(f -> newFile.setText(f.toAbsolutePath().toString()));
             });
 
@@ -517,8 +513,8 @@ public void actionPerformed(ActionEvent e) {
 
             // Key bindings:
             bb.getPanel()
-                    .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-                    .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
+              .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+              .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE_DIALOG), "close");
             bb.getPanel().getActionMap().put("close", cancelAction);
             pack();
             setLocationRelativeTo(diag);
diff --git a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
index 8575b610e45..4e129975fb0 100644
--- a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
+++ b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
@@ -35,13 +35,11 @@
 import javax.swing.table.TableColumnModel;
 
 import org.jabref.Globals;
-import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefDialog;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -52,7 +50,6 @@
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.util.FileType;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
@@ -235,12 +232,8 @@ private void setupPopupMenu() {
                     // Fall back to ".txt"
                     Optional<ExternalFileType> txtType = ExternalFileTypes.getInstance()
                             .getExternalFileTypeByExt("txt");
-                    if (txtType.isPresent()) {
-                        JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), fileName, txtType);
-                    } else {
-                        JabRefDesktop.openExternalFileUnknown(frame, new BibEntry(), new BibDatabaseContext(), fileName,
-                                new UnknownExternalFileType("terms"));
-                    }
+                    JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), fileName, type);
+
                 }
             } catch (IOException e) {
                 LOGGER.warn("Problem open protected terms file editor", e);
@@ -433,11 +426,9 @@ public AddFileDialog() {
                     .addExtensionFilter(FileType.TERMS)
                     .withDefaultExtension(FileType.TERMS)
                     .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-            DialogService ds = frame.getDialogService();
 
             browse.addActionListener(e -> {
-                Optional<Path> file = DefaultTaskExecutor
-                        .runInJavaFXThread(() -> ds.showFileOpenDialog(fileDialogConfiguration));
+                Optional<Path> file = DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
                 file.ifPresent(f -> newFile.setText(f.toAbsolutePath().toString()));
             });
 
diff --git a/src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml b/src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
index 4f4f9d3f057..930f08a1030 100644
--- a/src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
+++ b/src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<DialogPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="150.0" prefWidth="536.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.LinkedFileEditDialogController">
+<DialogPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="150.0" prefWidth="536.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.LinkedFileEditDialogView">
    <content>
       <GridPane>
         <columnConstraints>

From e1f85fd651ef8d16da0cdf7554a15bdda42cff27 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 24 Mar 2018 17:13:40 +0100
Subject: [PATCH 26/36] fix empty lines

---
 .../java/org/jabref/gui/filelist/LinkedFileEditDialogView.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
index 0d3fb5ccc35..8e2023bad7e 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
@@ -19,7 +19,6 @@
 
 public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
 
-
     @FXML private TextField link;
     @FXML private TextField description;
     @FXML private ComboBox<ExternalFileType> fileType;
@@ -28,6 +27,7 @@ public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
     @Inject private StateManager stateManager;
 
     @Inject private PreferencesService preferences;
+
     private final LinkedFilesEditDialogViewModel viewModel;
 
     public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
@@ -49,7 +49,6 @@ public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
         });
     }
 
-
     @FXML
     private void initialize() {
         fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());

From 8cb812d4b8f21014d18792a381311636127189d7 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 24 Mar 2018 17:21:56 +0100
Subject: [PATCH 27/36] fix checkstyle

---
 src/main/java/org/jabref/gui/help/AboutDialogView.java       | 3 ++-
 src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index 94f20f2adc9..ac8d286ece4 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -21,12 +21,13 @@
 public class AboutDialogView extends BaseDialog<Void> {
 
     @FXML private ButtonType copyVersionButton;
+    @FXML private TextArea textAreaVersions;
     @FXML protected ImageView iconImage;
+
     @Inject private DialogService dialogService;
     @Inject private ClipBoardManager clipBoardManager;
     @Inject private BuildInfo buildInfo;
 
-    @FXML private TextArea textAreaVersions;
     private AboutDialogViewModel viewModel;
 
     public AboutDialogView() {
diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
index 93cc9196605..7e6a43ecc26 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
@@ -256,8 +256,6 @@ public void setValues() {
         }
     }
 
-
-
     class ExportAction extends AbstractAction {
 
         public ExportAction() {
@@ -272,8 +270,7 @@ public void actionPerformed(ActionEvent e) {
                     .withDefaultExtension(FileType.XML)
                     .withInitialDirectory(prefs.get(JabRefPreferences.WORKING_DIRECTORY))
                     .build();
-            Optional<Path> path = DefaultTaskExecutor
-                    .runInJavaFXThread(() -> dialogService.showFileSaveDialog(fileDialogConfiguration));
+            Optional<Path> path = DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showFileSaveDialog(fileDialogConfiguration));
 
             path.ifPresent(exportFile -> {
                 try {

From 0be175c96b24020020a1c4961bbc3fc91a0d61c2 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 24 Mar 2018 19:31:53 +0100
Subject: [PATCH 28/36] Fix viewModel NPE in copyFiles Action and
 linkedfilesEditDialog

---
 .../java/org/jabref/gui/actions/CopyFilesAction.java     | 2 +-
 .../org/jabref/gui/copyfiles/CopyFilesDialogView.java    | 3 ++-
 .../jabref/gui/filelist/LinkedFileEditDialogView.java    | 9 ++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/actions/CopyFilesAction.java b/src/main/java/org/jabref/gui/actions/CopyFilesAction.java
index 39ea9b34d4c..5efa6415506 100644
--- a/src/main/java/org/jabref/gui/actions/CopyFilesAction.java
+++ b/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
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
index cd4b33832ea..672e4100e4e 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
@@ -28,11 +28,12 @@ public CopyFilesDialogView(BibDatabaseContext bibDatabaseContext, CopyFilesResul
         this.setTitle(Localization.lang("Result"));
         this.setResizable(true);
 
+        viewModel = new CopyFilesDialogViewModel(results);
+
         ViewLoader.view(this)
                   .load()
                   .setAsContent(this.getDialogPane());
 
-        viewModel = new CopyFilesDialogViewModel(results);
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
index 8e2023bad7e..ff670ba6891 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
@@ -28,9 +28,12 @@ public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
 
     @Inject private PreferencesService preferences;
 
-    private final LinkedFilesEditDialogViewModel viewModel;
+    private LinkedFilesEditDialogViewModel viewModel;
+
+    private final LinkedFile linkedFile;
 
     public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
+        this.linkedFile = wrapper.getLinkedFile();
 
         ViewLoader.view(this)
                   .load()
@@ -38,8 +41,6 @@ public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
 
         this.getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
 
-        viewModel = new LinkedFilesEditDialogViewModel(wrapper.getLinkedFile(), stateManager.getActiveDatabase().get(), dialogService, preferences);
-
         this.setResultConverter(button -> {
             if (button == ButtonType.APPLY) {
                 return viewModel.getNewLinkedFile();
@@ -51,6 +52,8 @@ public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
 
     @FXML
     private void initialize() {
+
+        viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences);
         fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
         description.textProperty().bindBidirectional(viewModel.descriptionProperty());
         link.textProperty().bindBidirectional(viewModel.linkProperty());

From 45697c4eaf073fb5c44122c0d0391778dac904a2 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 24 Mar 2018 19:37:20 +0100
Subject: [PATCH 29/36] Add close button in copy linked files

---
 .../java/org/jabref/gui/copyfiles/CopyFilesDialog.fxml     | 7 -------
 .../java/org/jabref/gui/copyfiles/CopyFilesDialogView.java | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialog.fxml b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialog.fxml
index 671b569acf3..6e7bb95f5f2 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialog.fxml
+++ b/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>
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
index 672e4100e4e..ff8fefd163b 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
@@ -2,6 +2,7 @@
 
 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,6 +29,8 @@ public CopyFilesDialogView(BibDatabaseContext bibDatabaseContext, CopyFilesResul
         this.setTitle(Localization.lang("Result"));
         this.setResizable(true);
 
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.CLOSE);
+
         viewModel = new CopyFilesDialogViewModel(results);
 
         ViewLoader.view(this)

From 7d627ffc71eaf69a2d8ec94fa7c27a34e554ee1f Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 24 Mar 2018 19:45:00 +0100
Subject: [PATCH 30/36] fix checkstyle

---
 src/main/java/org/jabref/gui/help/AboutDialogView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index ac8d286ece4..61f82fabdc3 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -22,7 +22,7 @@ public class AboutDialogView extends BaseDialog<Void> {
 
     @FXML private ButtonType copyVersionButton;
     @FXML private TextArea textAreaVersions;
-    @FXML protected ImageView iconImage;
+    @FXML private ImageView iconImage;
 
     @Inject private DialogService dialogService;
     @Inject private ClipBoardManager clipBoardManager;

From 3189b33b6fc623a71fb98a51ae5db8473deddf49 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 25 Mar 2018 13:06:59 +0200
Subject: [PATCH 31/36] Rename and reformat

---
 .../gui/filelist/LinkedFileEditDialogView.java |  8 ++++----
 .../LinkedFilesEditDialogViewModel.java        | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
index ff670ba6891..278d2cbf9ff 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
@@ -54,10 +54,10 @@ public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
     private void initialize() {
 
         viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences);
-        fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
-        description.textProperty().bindBidirectional(viewModel.descriptionProperty());
-        link.textProperty().bindBidirectional(viewModel.linkProperty());
-        fileType.valueProperty().bindBidirectional(viewModel.getSelectedExternalFileType());
+        fileType.itemsProperty().bindBidirectional(viewModel.externalFileType());
+        description.textProperty().bindBidirectional(viewModel.description());
+        link.textProperty().bindBidirectional(viewModel.link());
+        fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileType());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 305094ca567..47294315625 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -61,7 +61,7 @@ private void checkExtension() {
     }
 
     public void openBrowseDialog() {
-        String fileText = linkProperty().get();
+        String fileText = link().get();
 
         Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFileDirectoryPreferences());
 
@@ -69,9 +69,9 @@ public void openBrowseDialog() {
         String fileName = Paths.get(fileText).getFileName().toString();
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-        .withInitialDirectory(workingDir)
-        .withInitialFileName(fileName)
-        .build();
+                                                                                               .withInitialDirectory(workingDir)
+                                                                                               .withInitialFileName(fileName)
+                                                                                               .build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
             // Store the directory for next time:
@@ -81,7 +81,7 @@ public void openBrowseDialog() {
             List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
             path = FileUtil.shortenFileName(path, fileDirectories);
 
-            linkProperty().set(path.toString());
+            link().set(path.toString());
             checkExtension();
         });
     }
@@ -102,19 +102,19 @@ public void setValues(LinkedFile entry) {
         }
     }
 
-    public StringProperty linkProperty() {
+    public StringProperty link() {
         return linkProperty;
     }
 
-    public StringProperty descriptionProperty() {
+    public StringProperty description() {
         return descriptionProperty;
     }
 
-    public ListProperty<ExternalFileType> externalFileTypeProperty() {
+    public ListProperty<ExternalFileType> externalFileType() {
         return externalfilesTypes;
     }
 
-    public ObjectProperty<ExternalFileType> getSelectedExternalFileType() {
+    public ObjectProperty<ExternalFileType> selectedExternalFileType() {
         return selectedExternalFileType;
     }
 

From f579772fa33835258f84f46f1bba5a6267938c52 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 25 Mar 2018 14:03:24 +0200
Subject: [PATCH 32/36] remove changelog move fxml to java package remove
 wrapper class pass externalFileType to viewModel renammings

---
 CHANGELOG.md                                  |  1 -
 .../gui/fieldeditors/LinkedFileViewModel.java |  5 +-
 .../jabref/gui/filelist/AttachFileAction.java | 15 ++----
 .../gui/filelist/LinkedFileEditDialog.fxml    | 24 +++-------
 .../filelist/LinkedFileEditDialogView.java    |  9 ++--
 .../LinkedFilesEditDialogViewModel.java       | 48 +++++++++----------
 .../gui/filelist/LinkedFilesWrapper.java      | 19 --------
 .../gui/importer/ImportInspectionDialog.java  |  5 +-
 .../jabref/preferences/JabRefPreferences.java | 14 ++++++
 .../preferences/PreferencesService.java       |  7 ++-
 10 files changed, 61 insertions(+), 86 deletions(-)
 rename src/main/{resources => java}/org/jabref/gui/filelist/LinkedFileEditDialog.fxml (59%)
 delete mode 100644 src/main/java/org/jabref/gui/filelist/LinkedFilesWrapper.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 092e344707e..8807730b5bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,6 @@ The new default removes the linked file from the entry instead of deleting the f
 - Pressing <kbd>ESC</kbd> while searching will clear the search field and select the first entry, if available, in the table. [koppor#293](https://github.com/koppor/jabref/issues/293)
 - We changed the metadata reading and writing. DublinCore is now the only metadata format, JabRef supports. (https://github.com/JabRef/jabref/pull/3710)
 - 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 improved the layout of the Edit file layout and made it resizable. We also tweaked the workflow for attaching files from the contextmenu, see https://github.com/JabRef/jabref/pull/3005
 - We no longer print errors in field values during autosave into the log [#3811](https://github.com/JabRef/jabref/issues/3811)
 
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 0be2eef2659..04f84935594 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -30,7 +30,6 @@
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.filelist.LinkedFileEditDialogView;
-import org.jabref.gui.filelist.LinkedFilesWrapper;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.util.BackgroundTask;
@@ -317,9 +316,7 @@ public boolean delete(FileDirectoryPreferences prefs) {
 
     public void edit() {
 
-        LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
-        wrapper.setLinkedFile(this.linkedFile);
-        LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
+        LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(this.linkedFile);
 
         Optional<LinkedFile> editedFile = dialog.showAndWait();
         editedFile.ifPresent(file -> {
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index d26d041b963..70285312836 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -11,7 +11,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -32,7 +31,6 @@ public void execute() {
             return;
         }
         BibEntry entry = panel.getSelectedEntries().get(0);
-
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                                                                                                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
                                                                                                .build();
@@ -40,22 +38,17 @@ public void execute() {
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
             LinkedFile newLinkedFile = new LinkedFile("", newFile.toString(), "");
 
-            LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
-            wrapper.setLinkedFile(newLinkedFile);
-            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
+            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(newLinkedFile);
 
             Optional<LinkedFile> editedLinkeDfile = dialog.showAndWait();
             editedLinkeDfile.ifPresent(file -> {
 
                 Optional<FieldChange> fieldChange = entry.addFile(file);
-
-                if (fieldChange.isPresent()) {
-                    UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE,
-                                                                     entry.getField(FieldName.FILE).orElse(null),
-                                                                     fieldChange.get().getNewValue());
+                fieldChange.ifPresent(change -> {
+                    UndoableFieldChange ce = new UndoableFieldChange(change);
                     panel.getUndoManager().addEdit(ce);
                     panel.markBaseChanged();
-                }
+                });
             });
         });
     }
diff --git a/src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
similarity index 59%
rename from src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
rename to src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
index 930f08a1030..6cb65fcc83f 100644
--- a/src/main/resources/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialog.fxml
@@ -10,12 +10,12 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<DialogPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="150.0" prefWidth="536.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.LinkedFileEditDialogView">
+<DialogPane minHeight="-Infinity" prefHeight="150.0" prefWidth="536.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.filelist.LinkedFileEditDialogView">
    <content>
       <GridPane>
         <columnConstraints>
           <ColumnConstraints hgrow="NEVER" minWidth="10.0" prefWidth="100.0" />
-          <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="200.0" />
+          <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="200.0" />
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="108.0" />
         </columnConstraints>
         <rowConstraints>
@@ -24,29 +24,17 @@
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-               <Label minWidth="95.0" text="%Link">
-                   <padding>
-                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                   </padding>
-               </Label>
+               <Label minWidth="95.0" text="%Link" />
                <TextField fx:id="link" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
-               <Label text="Description" GridPane.rowIndex="1">
-                   <padding>
-                       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                   </padding>
-               </Label>
+               <Label text="Description" GridPane.rowIndex="1" />
                <TextField fx:id="description" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
             <ComboBox fx:id="fileType" minHeight="-Infinity" prefWidth="150.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2" />
-            <Button mnemonicParsing="false" onAction="#openBrowseDialog" text="%Browse" GridPane.columnIndex="2">
+            <Button id="browse" mnemonicParsing="false" onAction="#openBrowseDialog" text="%Browse" GridPane.columnIndex="2">
                <GridPane.margin>
                   <Insets left="10.0" />
                </GridPane.margin>
             </Button>
-            <Label text="Filetype" GridPane.rowIndex="2">
-               <padding>
-                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-               </padding>
-            </Label>
+            <Label text="Filetype" GridPane.rowIndex="2" />
          </children>
       </GridPane>
    </content>
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
index 278d2cbf9ff..b592295e02a 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
@@ -11,6 +11,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.PreferencesService;
@@ -31,10 +32,12 @@ public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
     private LinkedFilesEditDialogViewModel viewModel;
 
     private final LinkedFile linkedFile;
+    private ExternalFileTypes externalFileTypes;
 
-    public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
-        this.linkedFile = wrapper.getLinkedFile();
+    public LinkedFileEditDialogView(LinkedFile linkedFile) {
+        this.linkedFile = linkedFile;
 
+        this.externalFileTypes = ExternalFileTypes.getInstance();
         ViewLoader.view(this)
                   .load()
                   .setAsContent(this.getDialogPane());
@@ -53,7 +56,7 @@ public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
     @FXML
     private void initialize() {
 
-        viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences);
+        viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences, externalFileTypes);
         fileType.itemsProperty().bindBidirectional(viewModel.externalFileType());
         description.textProperty().bindBidirectional(viewModel.description());
         link.textProperty().bindBidirectional(viewModel.link());
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 47294315625..3114e7a4c63 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -24,39 +24,40 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.FileHelper;
-import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
 
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
-    private final StringProperty linkProperty = new SimpleStringProperty("");
-    private final StringProperty descriptionProperty = new SimpleStringProperty("");
-    private final ListProperty<ExternalFileType> externalfilesTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
+    private final StringProperty link = new SimpleStringProperty("");
+    private final StringProperty description = new SimpleStringProperty("");
+    private final ListProperty<ExternalFileType> allExternalFileTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
     private final ObjectProperty<ExternalFileType> selectedExternalFileType = new SimpleObjectProperty<>();
     private final BibDatabaseContext database;
     private final DialogService dialogService;
     private final PreferencesService preferences;
+    private final ExternalFileTypes externalFileTypes;
 
-    public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext database, DialogService dialogService, PreferencesService preferences2) {
+    public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext database, DialogService dialogService, PreferencesService preferences, ExternalFileTypes externalFileTypes) {
         this.database = database;
         this.dialogService = dialogService;
-        this.preferences = preferences2;
-        externalfilesTypes.set(FXCollections.observableArrayList(ExternalFileTypes.getInstance().getExternalFileTypeSelection()));
+        this.preferences = preferences;
+        this.externalFileTypes = externalFileTypes;
+        allExternalFileTypes.set(FXCollections.observableArrayList(externalFileTypes.getExternalFileTypeSelection()));
         setValues(linkedFile);
     }
 
     private void checkExtension() {
-        if (!linkProperty.getValueSafe().isEmpty()) {
+        if (!link.getValueSafe().isEmpty()) {
 
             // Check if this looks like a remote link:
-            if (REMOTE_LINK_PATTERN.matcher(linkProperty.get()).matches()) {
-                ExternalFileTypes.getInstance().getExternalFileTypeByExt("html").ifPresent(selectedExternalFileType::setValue);
+            if (REMOTE_LINK_PATTERN.matcher(link.get()).matches()) {
+                externalFileTypes.getExternalFileTypeByExt("html").ifPresent(selectedExternalFileType::setValue);
             }
 
             // Try to guess the file type:
-            String theLink = linkProperty.get().trim();
-            ExternalFileTypes.getInstance().getExternalFileTypeForName(theLink).ifPresent(selectedExternalFileType::setValue);
+            String theLink = link.get().trim();
+            externalFileTypes.getExternalFileTypeForName(theLink).ifPresent(selectedExternalFileType::setValue);
         }
     }
 
@@ -65,7 +66,7 @@ public void openBrowseDialog() {
 
         Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFileDirectoryPreferences());
 
-        Path workingDir = file.orElse(Paths.get(preferences.get(JabRefPreferences.WORKING_DIRECTORY)));
+        Path workingDir = file.orElse(preferences.getWorkingDir());
         String fileName = Paths.get(fileText).getFileName().toString();
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
@@ -75,7 +76,7 @@ public void openBrowseDialog() {
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
             // Store the directory for next time:
-            preferences.put(JabRefPreferences.WORKING_DIRECTORY, path.toString());
+            preferences.setWorkingDir(path);
 
             // If the file is below the file directory, make the path relative:
             List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
@@ -86,32 +87,31 @@ public void openBrowseDialog() {
         });
     }
 
-    //
-    public void setValues(LinkedFile entry) {
-        descriptionProperty.set(entry.getDescription());
-        linkProperty.set(entry.getLink());
+    public void setValues(LinkedFile linkedFile) {
+        description.set(linkedFile.getDescription());
+        link.set(linkedFile.getLink());
 
         selectedExternalFileType.setValue(null);
 
         // See what is a reasonable selection for the type combobox:
-        Optional<ExternalFileType> fileType = ExternalFileTypes.getInstance().fromLinkedFile(entry, false);
+        Optional<ExternalFileType> fileType = externalFileTypes.fromLinkedFile(linkedFile, false);
         if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
             selectedExternalFileType.setValue(fileType.get());
-        } else if ((entry.getLink() != null) && (!entry.getLink().isEmpty())) {
+        } else if ((linkedFile.getLink() != null) && (!linkedFile.getLink().isEmpty())) {
             checkExtension();
         }
     }
 
     public StringProperty link() {
-        return linkProperty;
+        return link;
     }
 
     public StringProperty description() {
-        return descriptionProperty;
+        return description;
     }
 
     public ListProperty<ExternalFileType> externalFileType() {
-        return externalfilesTypes;
+        return allExternalFileTypes;
     }
 
     public ObjectProperty<ExternalFileType> selectedExternalFileType() {
@@ -119,7 +119,7 @@ public ObjectProperty<ExternalFileType> selectedExternalFileType() {
     }
 
     public LinkedFile getNewLinkedFile() {
-        return new LinkedFile(descriptionProperty.getValue(), linkProperty.getValue(), selectedExternalFileType.getValue().toString());
+        return new LinkedFile(description.getValue(), link.getValue(), selectedExternalFileType.getValue().toString());
 
     }
 
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesWrapper.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesWrapper.java
deleted file mode 100644
index d71ce16d08d..00000000000
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesWrapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jabref.gui.filelist;
-
-import org.jabref.model.entry.LinkedFile;
-
-/**
- * Workaround to inject {@link LinkedFile} into javafx controller
- */
-public class LinkedFilesWrapper {
-
-    private LinkedFile linkedFile;
-
-    public LinkedFile getLinkedFile() {
-        return linkedFile;
-    }
-
-    public void setLinkedFile(LinkedFile linkedFile) {
-        this.linkedFile = linkedFile;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index 620cfa2edeb..c9730d463ff 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -69,7 +69,6 @@
 import org.jabref.gui.filelist.FileListEntry;
 import org.jabref.gui.filelist.FileListTableModel;
 import org.jabref.gui.filelist.LinkedFileEditDialogView;
-import org.jabref.gui.filelist.LinkedFilesWrapper;
 import org.jabref.gui.groups.GroupTreeNodeViewModel;
 import org.jabref.gui.groups.UndoableChangeEntriesOfGroup;
 import org.jabref.gui.help.HelpAction;
@@ -1318,9 +1317,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             entry = selectionModel.getSelected().get(0);
             LinkedFile linkedFile = new LinkedFile("", "", "");
 
-            LinkedFilesWrapper wrapper = new LinkedFilesWrapper();
-            wrapper.setLinkedFile(linkedFile);
-            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(wrapper);
+            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
 
             Optional<LinkedFile> editedLinkedFile = DefaultTaskExecutor.runInJavaFXThread(() -> dialog.showAndWait());
             editedLinkedFile.ifPresent(file -> entry.addFile(linkedFile));
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index f4fda131aee..0a7246e7436 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -14,6 +14,8 @@
 import java.net.UnknownHostException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -1373,6 +1375,7 @@ public void storeFileHistory(FileHistory history) {
         }
     }
 
+    @Override
     public FileDirectoryPreferences getFileDirectoryPreferences() {
         List<String> fields = Arrays.asList(FieldName.FILE, FieldName.PDF, FieldName.PS);
         Map<String, String> fieldDirectories = new HashMap<>();
@@ -1742,4 +1745,15 @@ public MainTablePreferences getMainTablePreferences() {
                 getColumnPreferences(),
                 getBoolean(AUTO_RESIZE_MODE));
     }
+
+    @Override
+    public Path getWorkingDir() {
+        return Paths.get(get(WORKING_DIRECTORY));
+    }
+
+    @Override
+    public void setWorkingDir(Path dir) {
+        put(WORKING_DIRECTORY, dir.toString());
+
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 2759b328528..1245e404ba7 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -1,5 +1,7 @@
 package org.jabref.preferences;
 
+import java.nio.file.Path;
+
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.model.metadata.FileDirectoryPreferences;
@@ -15,7 +17,8 @@ public interface PreferencesService {
 
     FileDirectoryPreferences getFileDirectoryPreferences();
 
-    String get(String key);
+    Path getWorkingDir();
+
+    void setWorkingDir(Path dir);
 
-    void put(String key, String value);
 }

From 95fdd2d398e846e247e5cb8b11a2c6253be9177a Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 25 Mar 2018 14:07:43 +0200
Subject: [PATCH 33/36] remove close  method Add ok button to dialog pane

---
 .../org/jabref/gui/copyfiles/CopyFilesDialogView.java    | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
index ff8fefd163b..bbf813c4c14 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.copyfiles;
 
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
@@ -29,19 +28,13 @@ public CopyFilesDialogView(BibDatabaseContext bibDatabaseContext, CopyFilesResul
         this.setTitle(Localization.lang("Result"));
         this.setResizable(true);
 
-        this.getDialogPane().getButtonTypes().addAll(ButtonType.CLOSE);
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.OK);
 
         viewModel = new CopyFilesDialogViewModel(results);
 
         ViewLoader.view(this)
                   .load()
                   .setAsContent(this.getDialogPane());
-
-    }
-
-    @FXML
-    private void close(@SuppressWarnings("unused") ActionEvent event) {
-        close();
     }
 
     @FXML

From bb22a5eb828a437be7a7a75e71614e2568c967de Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 25 Mar 2018 14:12:01 +0200
Subject: [PATCH 34/36] change some odd looking assigments

---
 .../jabref/gui/filelist/LinkedFilesEditDialogViewModel.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 3114e7a4c63..006cb9567ca 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -62,7 +62,7 @@ private void checkExtension() {
     }
 
     public void openBrowseDialog() {
-        String fileText = link().get();
+        String fileText = link.get();
 
         Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFileDirectoryPreferences());
 
@@ -82,7 +82,7 @@ public void openBrowseDialog() {
             List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
             path = FileUtil.shortenFileName(path, fileDirectories);
 
-            link().set(path.toString());
+            link.set(path.toString());
             checkExtension();
         });
     }

From 035d9e2d6ac273ae474c17498cd0790098603cc2 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 25 Mar 2018 17:55:18 +0200
Subject: [PATCH 35/36] renaming

---
 .../gui/filelist/LinkedFileEditDialogView.java |  8 ++++----
 .../LinkedFilesEditDialogViewModel.java        | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
index b592295e02a..3833f493437 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFileEditDialogView.java
@@ -57,10 +57,10 @@ public LinkedFileEditDialogView(LinkedFile linkedFile) {
     private void initialize() {
 
         viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences, externalFileTypes);
-        fileType.itemsProperty().bindBidirectional(viewModel.externalFileType());
-        description.textProperty().bindBidirectional(viewModel.description());
-        link.textProperty().bindBidirectional(viewModel.link());
-        fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileType());
+        fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
+        description.textProperty().bindBidirectional(viewModel.descriptionProperty());
+        link.textProperty().bindBidirectional(viewModel.linkProperty());
+        fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileTypeProperty());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 006cb9567ca..71dae7d7cf8 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -47,16 +47,16 @@ public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext
         setValues(linkedFile);
     }
 
-    private void checkExtension() {
-        if (!link.getValueSafe().isEmpty()) {
+    private void setExternalFileTypeByExtension(String link) {
+        if (!link.isEmpty()) {
 
             // Check if this looks like a remote link:
-            if (REMOTE_LINK_PATTERN.matcher(link.get()).matches()) {
+            if (REMOTE_LINK_PATTERN.matcher(link).matches()) {
                 externalFileTypes.getExternalFileTypeByExt("html").ifPresent(selectedExternalFileType::setValue);
             }
 
             // Try to guess the file type:
-            String theLink = link.get().trim();
+            String theLink = link.trim();
             externalFileTypes.getExternalFileTypeForName(theLink).ifPresent(selectedExternalFileType::setValue);
         }
     }
@@ -83,7 +83,7 @@ public void openBrowseDialog() {
             path = FileUtil.shortenFileName(path, fileDirectories);
 
             link.set(path.toString());
-            checkExtension();
+            setExternalFileTypeByExtension(link.getValueSafe());
         });
     }
 
@@ -102,19 +102,19 @@ public void setValues(LinkedFile linkedFile) {
         }
     }
 
-    public StringProperty link() {
+    public StringProperty linkProperty() {
         return link;
     }
 
-    public StringProperty description() {
+    public StringProperty descriptionProperty() {
         return description;
     }
 
-    public ListProperty<ExternalFileType> externalFileType() {
+    public ListProperty<ExternalFileType> externalFileTypeProperty() {
         return allExternalFileTypes;
     }
 
-    public ObjectProperty<ExternalFileType> selectedExternalFileType() {
+    public ObjectProperty<ExternalFileType> selectedExternalFileTypeProperty() {
         return selectedExternalFileType;
     }
 

From ce3d5e65df0de6b8fc49e06b120d912aa3a8bdf6 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 25 Mar 2018 17:56:25 +0200
Subject: [PATCH 36/36] forgotten rename

---
 .../org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 71dae7d7cf8..5a24ba38822 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -98,7 +98,7 @@ public void setValues(LinkedFile linkedFile) {
         if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
             selectedExternalFileType.setValue(fileType.get());
         } else if ((linkedFile.getLink() != null) && (!linkedFile.getLink().isEmpty())) {
-            checkExtension();
+            setExternalFileTypeByExtension(linkedFile.getLink());
         }
     }