Improved code and added CHANGELOG entry

JabRef · Aug 8, 2016 · 00a27ac · 00a27ac
1 parent da09197
commit 00a27ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Undo/redo are enabled/disabled and show the action in the tool tip
 - Added ISBN integrity checker
 - Added filter to not show selected integrity checks
+- The information shown in the main table now resolves crossrefs and strings
 - Enhance the entry customization dialog to give better visual feedback
 - It is now possible to generate a new BIB database from the citations in an OpenOffice/LibreOffice document
 - The arXiv fetcher now also supports free-text search queries

diff --git a/src/main/java/net/sf/jabref/gui/maintable/MainTableColumn.java b/src/main/java/net/sf/jabref/gui/maintable/MainTableColumn.java
@@ -113,17 +113,10 @@ public Object getColumnValue(BibEntry entry) {
                 content = EntryUtil.capitalizeFirst(entry.getType());
             } else {
                 if (database.isPresent()) {
-                    content = BibDatabase.getResolvedField(field, entry, database.get());
+                    content = BibDatabase.getResolvedField(field, entry, database.get()).orElse(null);
+                } else {
+                    content = entry.getFieldOrAlias(field).orElse(null);
                 }
-                /*
-                Optional<String> newContent = entry.getFieldOrAlias(field);
-                if (newContent.isPresent()) {
-                    if (database.isPresent() && "Author".equalsIgnoreCase(columnName)) {
-                        content = database.get().resolveForStrings(newContent.get());
-                    } else {
-                        content = newContent.get();
-                    }
-                }*/
             }
             if (content != null) {
                 break;