Add file description to gui and fix sync bug

src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java

@@ -107,7 +107,7 @@ public void acceptAsLinked() {
     }
 
     public Observable[] getObservables() {
-        return new Observable[] {this.downloadProgress, this.isAutomaticallyFound};
+        return linkedFile.getObservables();
     }
 
     public void open() {

src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java

@@ -16,6 +16,7 @@
 import javafx.scene.control.ListView;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.ProgressBar;
+import javafx.scene.control.Separator;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.ClipboardContent;
@@ -56,7 +57,6 @@ public LinkedFilesEditor(String fieldName, DialogService dialogService, BibDatab
         ControlHelper.loadFXMLForControl(this);
 
         ViewModelListCellFactory<LinkedFileViewModel> cellFactory = new ViewModelListCellFactory<LinkedFileViewModel>()
-                .withTooltip(LinkedFileViewModel::getDescription)
                 .withGraphic(LinkedFilesEditor::createFileDisplay)
                 .withContextMenu(this::createContextMenuForFile)
                 .withOnMouseClickedEvent(this::handleItemMouseClick)
@@ -149,6 +149,8 @@ private void handleOnDragDropped(LinkedFileViewModel originalItem, DragEvent eve
     private static Node createFileDisplay(LinkedFileViewModel linkedFile) {
         Text icon = MaterialDesignIconFactory.get().createIcon(linkedFile.getTypeIcon());
         Text text = new Text(linkedFile.getLink());
+        Text desc = new Text(linkedFile.getDescription());
+
         ProgressBar progressIndicator = new ProgressBar();
         progressIndicator.progressProperty().bind(linkedFile.downloadProgressProperty());
         progressIndicator.visibleProperty().bind(linkedFile.downloadOngoingProperty());
@@ -161,7 +163,8 @@ private static Node createFileDisplay(LinkedFileViewModel linkedFile) {
 
         HBox container = new HBox(10);
         container.setPrefHeight(Double.NEGATIVE_INFINITY);
-        container.getChildren().addAll(icon, text, progressIndicator, acceptAutoLinkedFile);
+        Separator separator = new Separator();
+        container.getChildren().addAll(icon, text, separator, desc, progressIndicator, acceptAutoLinkedFile);
         return container;
     }
 

src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java

@@ -69,6 +69,7 @@ public LinkedFilesEditorViewModel(String fieldName, AutoCompleteSuggestionProvid
                 text,
                 LinkedFilesEditorViewModel::getStringRepresentation,
                 this::parseToFileViewModel);
+
     }
 
     private static String getStringRepresentation(List<LinkedFileViewModel> files) {

src/main/java/org/jabref/model/entry/FileFieldWriter.java

@@ -7,7 +7,7 @@
 
 public class FileFieldWriter {
 
-    private FileFieldWriter() {
+    FileFieldWriter() {
     }
 
     public static String getStringRepresentation(List<LinkedFile> fields) {

src/main/java/org/jabref/model/entry/LinkedFile.java

@@ -8,6 +8,14 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import javafx.beans.Observable;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.metadata.FileDirectoryPreferences;
 import org.jabref.model.util.FileHelper;
@@ -19,42 +27,49 @@
 public class LinkedFile implements Serializable {
 
     private static final LinkedFile NULL_OBJECT = new LinkedFile("", "", "");
-    private String description;
-    private String link;
-    private String fileType;
+    private final StringProperty description = new SimpleStringProperty();
+    private final StringProperty link = new SimpleStringProperty();
+    private final StringProperty fileType = new SimpleStringProperty();
+    private final DoubleProperty downloadProgress = new SimpleDoubleProperty(-1);
+    private final BooleanProperty isAutomaticallyFound = new SimpleBooleanProperty(false);
 
     public LinkedFile(String description, String link, String fileType) {
-        this.description = Objects.requireNonNull(description);
-        this.link = Objects.requireNonNull(link);
-        this.fileType = Objects.requireNonNull(fileType);
+        this.description.setValue(Objects.requireNonNull(description));
+        this.link.setValue(Objects.requireNonNull(link));
+        this.fileType.setValue(Objects.requireNonNull(fileType));
     }
 
     public LinkedFile(String description, URL link, String fileType) {
         this(description, Objects.requireNonNull(link).toString(), fileType);
     }
 
     public String getFileType() {
-        return fileType;
+        return fileType.get();
     }
 
     public void setFileType(String fileType) {
-        this.fileType = fileType;
+        this.fileType.setValue(fileType);
     }
 
     public String getDescription() {
-        return description;
+        return description.get();
     }
 
     public void setDescription(String description) {
-        this.description = description;
+        this.description.setValue(description);
+
     }
 
     public String getLink() {
-        return link;
+        return link.get();
     }
 
     public void setLink(String link) {
-        this.link = link;
+        this.link.setValue(link);
+    }
+
+    public Observable[] getObservables() {
+        return new Observable[] {this.downloadProgress, this.isAutomaticallyFound};
     }
 
     @Override
@@ -96,7 +111,7 @@ public boolean isEmpty() {
     }
 
     public boolean isOnlineLink() {
-        return link.startsWith("http://") || link.startsWith("https://") || link.contains("www.");
+        return link.get().startsWith("http://") || link.get().startsWith("https://") || link.get().contains("www.");
     }
 
     public Optional<Path> findIn(BibDatabaseContext databaseContext, FileDirectoryPreferences fileDirectoryPreferences) {
@@ -105,11 +120,11 @@ public Optional<Path> findIn(BibDatabaseContext databaseContext, FileDirectoryPr
     }
 
     public Optional<Path> findIn(List<Path> directories) {
-        Path file = Paths.get(link);
+        Path file = Paths.get(link.get());
         if (file.isAbsolute() || directories.isEmpty()) {
             return Optional.of(file);
         } else {
-            return FileHelper.expandFilenameAsPath(link, directories);
+            return FileHelper.expandFilenameAsPath(link.get(), directories);
         }
     }
 }

src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java

@@ -0,0 +1,61 @@
+package org.jabref.model.entry;
+
+import org.jabref.logic.exporter.BibtexDatabaseWriter;
+import org.jabref.logic.exporter.SaveException;
+import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.StringSaveSession;
+import org.jabref.logic.util.OS;
+import org.jabref.model.Defaults;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.metadata.MetaData;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class FileFieldBibEntryTest {
+
+    private BibEntry emptyEntry;
+
+    @Before
+    public void setUp() {
+        emptyEntry = new BibEntry();
+        emptyEntry.setType("article");
+        emptyEntry.setChanged(false);
+    }
+
+    @Test
+    public void testFileFieldSerialization() {
+        LinkedFile file = new LinkedFile("test", "/home/uers/test.pdf", "PDF");
+        emptyEntry.addFile(file);
+
+        assertEquals("@article{,\n" +
+                "  file = {test:/home/uers/test.pdf:PDF}\n" +
+                "}", emptyEntry.toString());
+    }
+
+    @Test
+    public void testFileFieldSerializationDatabase() throws SaveException {
+        BibDatabase database = new BibDatabase();
+
+        LinkedFile file = new LinkedFile("test", "/home/uers/test.pdf", "PDF");
+        emptyEntry.addFile(file);
+        database.insertEntries(emptyEntry);
+
+        BibtexDatabaseWriter<StringSaveSession> databaseWriter = new BibtexDatabaseWriter<>(StringSaveSession::new);
+        StringSaveSession saveSession = databaseWriter.savePartOfDatabase(
+                new BibDatabaseContext(database, new MetaData(), new Defaults()), database.getEntries(),
+                new SavePreferences());
+
+        assertEquals(OS.NEWLINE +
+                "@Article{,"
+                + OS.NEWLINE
+                + "  file = {test:/home/uers/test.pdf:PDF},"
+                + OS.NEWLINE
+                + "}" + OS.NEWLINE
+                + OS.NEWLINE
+                + "@Comment{jabref-meta: databaseType:bibtex;}" + OS.NEWLINE, saveSession.getStringValue());
+    }
+}

src/test/java/org/jabref/model/entry/FileFieldWriterTest.java

@@ -103,9 +103,17 @@ public void testQuoteNull() {
 
     @Test
     public void testEncodeStringArray() {
-        assertEquals("a:b;c:d", FileFieldWriter.encodeStringArray(new String[][]{{"a", "b"}, {"c", "d"}}));
-        assertEquals("a:;c:d", FileFieldWriter.encodeStringArray(new String[][]{{"a", ""}, {"c", "d"}}));
-        assertEquals("a:" + null + ";c:d", FileFieldWriter.encodeStringArray(new String[][]{{"a", null}, {"c", "d"}}));
-        assertEquals("a:\\:b;c\\;:d", FileFieldWriter.encodeStringArray(new String[][]{{"a", ":b"}, {"c;", "d"}}));
+        assertEquals("a:b;c:d", FileFieldWriter.encodeStringArray(new String[][] {{"a", "b"}, {"c", "d"}}));
+        assertEquals("a:;c:d", FileFieldWriter.encodeStringArray(new String[][] {{"a", ""}, {"c", "d"}}));
+        assertEquals("a:" + null + ";c:d", FileFieldWriter.encodeStringArray(new String[][] {{"a", null}, {"c", "d"}}));
+        assertEquals("a:\\:b;c\\;:d", FileFieldWriter.encodeStringArray(new String[][] {{"a", ":b"}, {"c;", "d"}}));
     }
+
+    @Test
+    public void testFileFieldWriterGetStringRepresentation() {
+        LinkedFile file = new LinkedFile("test", "X:\\Users\\abc.pdf", "PDF");
+        assertEquals("test:X\\:\\\\Users\\\\abc.pdf:PDF", FileFieldWriter.getStringRepresentation(file));
+    }
+
+
 }