Remove wrapper for getReferencedEntry

JabRef · Jul 22, 2021 · 1b50be6 · 1b50be6
1 parent abcdcad
commit 1b50be6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
@@ -17,6 +17,7 @@
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 import org.jabref.gui.util.uithreadaware.UiThreadBinding;
 import org.jabref.logic.importer.util.FileFieldParser;
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -39,10 +40,12 @@ public class BibEntryTableViewModel {
     private final EasyBinding<List<LinkedFile>> linkedFiles;
     private final EasyBinding<Map<Field, String>> linkedIdentifiers;
     private final Binding<List<AbstractGroup>> matchedGroups;
+    private final BibDatabase bibDatabase;
 
     public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext bibDatabaseContext, ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter) {
         this.entry = entry;
         this.fieldValueFormatter = fieldValueFormatter;
+        this.bibDatabase = bibDatabaseContext.getDatabase();
 
         this.linkedFiles = getField(StandardField.FILE).map(FileFieldParser::parse).orElse(Collections.emptyList());
         this.linkedIdentifiers = createLinkedIdentifiersBinding(entry);
@@ -114,7 +117,7 @@ public ObservableValue<String> getFields(OrFields fields) {
         }
 
         ArrayList<Observable> observables = new ArrayList<>(List.of(entry.getObservables()));
-        Optional<BibEntry> referenced = fieldValueFormatter.getValue().getReferencedEntry(entry);
+        Optional<BibEntry> referenced = bibDatabase.getReferencedEntry(entry);
         referenced.ifPresent(bibEntry -> observables.addAll(List.of(bibEntry.getObservables())));
         observables.add(fieldValueFormatter);
 

diff --git a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
@@ -84,13 +84,4 @@ private String formatFieldWithAuthorValue(final String nameToFormat) {
             case NATBIB -> authors.latexFree().getAsNatbib();
         };
     }
-
-    /***
-     * Finds the entry in the crossref field
-     * @param entry the entry to be searched
-     * @return The referenced entry
-     */
-    public Optional<BibEntry> getReferencedEntry(BibEntry entry) {
-        return bibDatabase.getReferencedEntry(entry);
-    }
 }