Skip to content

Empty String instead of N/A in file annotations #3288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2017
Merged

Empty String instead of N/A in file annotations #3288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,16 @@ public FileAnnotationViewModel(FileAnnotation annotation) {

private void setupContentProperties(FileAnnotation annotation) {
if (annotation.hasLinkedAnnotation()) {
this.content.set(toNAifEmpty(annotation.getLinkedFileAnnotation().getContent()));
this.content.set(annotation.getLinkedFileAnnotation().getContent());
String annotationContent = annotation.getContent();
String illegibleTextMessage = Localization.lang("The marked area does not contain any legible text!");
this.marking.set(annotationContent.isEmpty() ? illegibleTextMessage : annotationContent);
} else {
this.content.set(toNAifEmpty(annotation.getContent()));
this.marking.set("N/A");
this.content.set(annotation.getContent());
this.marking.set("");
}
}

private static String toNAifEmpty(String content) {
if (content.isEmpty()) {
return "N/A";
}
return content;
}

public String getAuthor() {
return author.get();
}
Expand Down