Fix author formatter for unchanged names

config/checkstyle/checkstyle.xml

@@ -12,7 +12,7 @@
 
     <!-- BeforeExecutionFileFilters is required for sources that are based on java14 -->
     <module name="BeforeExecutionExclusionFileFilter">
-      <property name="fileNamePattern" value="AuthorAndsReplacer.java|Ordinal.java|EntryTypeView.java" />
+      <property name="fileNamePattern" value="AuthorAndsReplacer.java|EntryTypeView.java|MainTableFieldValueFormatter.java|Ordinal.java" />
     </module>
 
     <module name="SuppressionFilter">

src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java

@@ -14,13 +14,11 @@
 import javafx.beans.value.ObservableValue;
 
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
-import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FileFieldParser;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
@@ -33,22 +31,20 @@
 
 public class BibEntryTableViewModel {
     private final BibEntry entry;
-    private final BibDatabase database;
-    private final ObservableValue<MainTableNameFormatter> nameFormatter;
+    private final ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter;
     private final Map<OrFields, ObservableValue<String>> fieldValues = new HashMap<>();
     private final Map<SpecialField, OptionalBinding<SpecialFieldValueViewModel>> specialFieldValues = new HashMap<>();
     private final EasyBinding<List<LinkedFile>> linkedFiles;
     private final EasyBinding<Map<Field, String>> linkedIdentifiers;
     private final ObservableValue<List<AbstractGroup>> matchedGroups;
 
-    public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext database, ObservableValue<MainTableNameFormatter> nameFormatter) {
+    public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext bibDatabaseContext, ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter) {
         this.entry = entry;
-        this.database = database.getDatabase();
-        this.nameFormatter = nameFormatter;
+        this.fieldValueFormatter = fieldValueFormatter;
 
         this.linkedFiles = getField(StandardField.FILE).map(FileFieldParser::parse).orElse(Collections.emptyList());
         this.linkedIdentifiers = createLinkedIdentifiersBinding(entry);
-        this.matchedGroups = createMatchedGroupsBinding(database, entry);
+        this.matchedGroups = createMatchedGroupsBinding(bibDatabaseContext, entry);
     }
 
     private static EasyBinding<Map<Field, String>> createLinkedIdentifiersBinding(BibEntry entry) {
@@ -120,26 +116,11 @@ public ObservableValue<String> getFields(OrFields fields) {
         }
 
         ArrayList<Observable> observables = new ArrayList<>(List.of(entry.getObservables()));
-        observables.add(nameFormatter);
-
-        value = Bindings.createStringBinding(() -> {
-            for (Field field : fields) {
-                if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
-                    Optional<String> name = entry.getResolvedFieldOrAlias(field, database);
-
-                    if (name.isPresent()) {
-                        return nameFormatter.getValue().formatNameLatexFree(name.get());
-                    }
-                } else {
-                    Optional<String> content = entry.getResolvedFieldOrAliasLatexFree(field, database);
-
-                    if (content.isPresent()) {
-                        return content.get();
-                    }
-                }
-            }
-            return "";
-        }, observables.toArray(Observable[]::new));
+        observables.add(fieldValueFormatter);
+
+        value = Bindings.createStringBinding(() ->
+                fieldValueFormatter.getValue().formatFieldsValues(fields, entry),
+                observables.toArray(Observable[]::new));
         fieldValues.put(fields, value);
         return value;
     }

src/main/java/org/jabref/gui/maintable/MainTableDataModel.java

@@ -29,15 +29,19 @@ public class MainTableDataModel {
     private final FilteredList<BibEntryTableViewModel> entriesFiltered;
     private final SortedList<BibEntryTableViewModel> entriesSorted;
     private final GroupViewMode groupViewMode;
-    private final ObjectProperty<MainTableNameFormatter> nameFormatter;
+    private final ObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter;
     private final PreferencesService preferencesService;
+    private final BibDatabaseContext bibDatabaseContext;
 
     public MainTableDataModel(BibDatabaseContext context, PreferencesService preferencesService, StateManager stateManager) {
-        this.nameFormatter = new SimpleObjectProperty<>(new MainTableNameFormatter(preferencesService));
         this.preferencesService = preferencesService;
+        this.bibDatabaseContext = context;
+        this.fieldValueFormatter = new SimpleObjectProperty<>(
+                new MainTableFieldValueFormatter(preferencesService, bibDatabaseContext));
 
         ObservableList<BibEntry> allEntries = BindingsHelper.forUI(context.getDatabase().getEntries());
-        ObservableList<BibEntryTableViewModel> entriesViewModel = EasyBind.mapBacked(allEntries, entry -> new BibEntryTableViewModel(entry, context, nameFormatter));
+        ObservableList<BibEntryTableViewModel> entriesViewModel = EasyBind.mapBacked(allEntries, entry ->
+                new BibEntryTableViewModel(entry, bibDatabaseContext, fieldValueFormatter));
 
         entriesFiltered = new FilteredList<>(entriesViewModel);
         entriesFiltered.predicateProperty().bind(
@@ -86,6 +90,6 @@ public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
     }
 
     public void refresh() {
-        this.nameFormatter.setValue(new MainTableNameFormatter(preferencesService));
+        this.fieldValueFormatter.setValue(new MainTableFieldValueFormatter(preferencesService, bibDatabaseContext));
     }
 }

src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java

@@ -0,0 +1,87 @@
+package org.jabref.gui.maintable;
+
+import java.util.Optional;
+
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldProperty;
+import org.jabref.model.entry.field.OrFields;
+import org.jabref.preferences.PreferencesService;
+
+import static org.jabref.gui.maintable.MainTableNameFormatPreferences.AbbreviationStyle;
+import static org.jabref.gui.maintable.MainTableNameFormatPreferences.DisplayStyle;
+
+public class MainTableFieldValueFormatter {
+    private final DisplayStyle displayStyle;
+    private final AbbreviationStyle abbreviationStyle;
+    private final BibDatabase bibDatabase;
+
+    MainTableFieldValueFormatter(PreferencesService preferences, BibDatabaseContext bibDatabaseContext) {
+        MainTableNameFormatPreferences nameFormatPreferences = preferences.getMainTableNameFormatPreferences();
+        this.displayStyle = nameFormatPreferences.getDisplayStyle();
+        this.abbreviationStyle = nameFormatPreferences.getAbbreviationStyle();
+        this.bibDatabase = bibDatabaseContext.getDatabase();
+    }
+
+    /**
+     * Format fields for {@link BibEntryTableViewModel}, according to user preferences and with latex translated to
+     * unicode if possible.
+     *
+     * @param fields the fields argument of {@link BibEntryTableViewModel#getFields(OrFields)}.
+     * @param entry the BibEntry of {@link BibEntryTableViewModel}.
+     * @return The formatted name field.
+     */
+    public String formatFieldsValues(final OrFields fields, final BibEntry entry) {
+        for (Field field : fields) {
+            if (field.getProperties().contains(FieldProperty.PERSON_NAMES) && displayStyle != DisplayStyle.AS_IS) {
+                Optional<String> name = entry.getResolvedFieldOrAlias(field, bibDatabase);
+
+                if (name.isPresent()) {
+                    return formatFieldWithAuthorValue(name.get());
+                }
+            } else {
+                Optional<String> content = entry.getResolvedFieldOrAliasLatexFree(field, bibDatabase);
+
+                if (content.isPresent()) {
+                    return content.get();
+                }
+            }
+        }
+        return "";
+    }
+
+    /**
+     * Format a name field for the table, according to user preferences and with latex expressions translated if
+     * possible.
+     *
+     * @param nameToFormat The contents of the name field.
+     * @return The formatted name field.
+     */
+    private String formatFieldWithAuthorValue(final String nameToFormat) {
+        if (nameToFormat == null) {
+            return null;
+        }
+
+        AuthorList authors = AuthorList.parse(nameToFormat);
+
+        if (((displayStyle == DisplayStyle.FIRSTNAME_LASTNAME)
+                || (displayStyle == DisplayStyle.LASTNAME_FIRSTNAME))
+                && abbreviationStyle == AbbreviationStyle.LASTNAME_ONLY) {
+            return authors.getAsLastNamesLatexFree(false);
+        }
+
+        return switch (displayStyle) {
+            default -> nameToFormat;
+            case FIRSTNAME_LASTNAME -> authors.getAsFirstLastNamesLatexFree(
+                    abbreviationStyle == AbbreviationStyle.FULL,
+                    false);
+            case LASTNAME_FIRSTNAME -> authors.getAsLastFirstNamesLatexFree(
+                    abbreviationStyle == AbbreviationStyle.FULL,
+                    false);
+            case NATBIB -> authors.getAsNatbibLatexFree();
+        };
+    }
+}

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

@@ -146,8 +146,8 @@ public int hashCode() {
 
     /**
      * Compare this object with the given one.
-     * <p>
-     * Will return true iff the other object is an Author and all fields are identical on a string comparison.
+     *
+     * @return `true` iff the other object is an Author and all fields are `Objects.equals`.
      */
     @Override
     public boolean equals(Object other) {