javafx replacement for file dialog

src/main/java/org/jabref/gui/filelist/AttachFileAction.java

@@ -1,14 +1,11 @@
 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 {
@@ -27,9 +24,14 @@ 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);
 
@@ -39,6 +41,6 @@ public void action() {
                 panel.getUndoManager().addEdit(ce);
                 panel.markBaseChanged();
             }
-        }
+        }*/
     }
 }

src/main/java/org/jabref/gui/filelist/FileListDialogController.java

@@ -0,0 +1,90 @@
+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.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);
+
+    @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;
+
+    @FXML
+    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());
+    }
+
+    @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) {
+
+    }
+
+    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);
+            }
+        }
+    }
+}

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();
+
+    }
+}

src/main/java/org/jabref/gui/filelist/FileListDialogViewModel.java

@@ -0,0 +1,128 @@
+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, 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;
+    }
+
+    public StringProperty descriptionProperty() {
+        return descriptionProperty;
+    }
+
+    public ListProperty<ExternalFileType> externalFileTypeProperty() {
+        return externalfilesTypes;
+    }
+
+    public ObjectProperty<ExternalFileType> getSelectedExternalFileType() {
+        return selectedExternalFileType;
+    }
+}

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());

src/main/resources/org/jabref/gui/filelist/FileListDialog.fxml

@@ -0,0 +1,68 @@
+<?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>