Skip to content
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

Jump to bottom

Treat unknown fields as multi-line fields #5230

Merged
merged 1 commit into from
Aug 25, 2019
Merged

Treat unknown fields as multi-line fields #5230

Show file tree
Hide file tree
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
8 changes: 3 additions & 5 deletions src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,12 @@ public static FieldEditorFX getForField(final Field field,
return new PersonsEditor(field, suggestionProvider, preferences, fieldCheckers, isSingleLine);
} else if (StandardField.KEYWORDS.equals(field)) {
return new KeywordsEditor(field, suggestionProvider, fieldCheckers, preferences);
} else if (fieldProperties.contains(FieldProperty.MULTILINE_TEXT)) {
return new MultilineEditor(field, suggestionProvider, fieldCheckers, preferences);
} else if (field == InternalField.KEY_FIELD) {
return new BibtexKeyEditor(field, preferences, suggestionProvider, fieldCheckers, databaseContext, undoManager, dialogService);
} else {
// default
return new SimpleEditor(field, suggestionProvider, fieldCheckers, preferences, isSingleLine);
}

// default
return new SimpleEditor(field, suggestionProvider, fieldCheckers, preferences, isSingleLine);
}

@SuppressWarnings("unchecked")
Expand Down
18 changes: 0 additions & 18 deletions src/main/java/org/jabref/gui/fieldeditors/MultilineEditor.java
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion src/main/java/org/jabref/model/entry/field/FieldFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,13 @@ public static List<Field> getDefaultGeneralFields() {
return defaultGeneralFields;
}

// TODO: Move somewhere more appropriate and make user-configurable
public static boolean isSingleLineField(final Field field) {
return !field.getProperties().contains(FieldProperty.MULTILINE_TEXT);
if (field.equals(StandardField.ABSTRACT) || field.equals(StandardField.COMMENT)) {
return false;
}

// Treat unknown fields as multi-line fields
return !(field instanceof UnknownField);
}
}
1 change: 0 additions & 1 deletion src/main/java/org/jabref/model/entry/field/FieldProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public enum FieldProperty {
JOURNAL_NAME,
LANGUAGE,
MONTH,
MULTILINE_TEXT,
MULTIPLE_ENTRY_LINK,
NUMERIC,
PAGES,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jabref/model/entry/field/StandardField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
public enum StandardField implements Field {

ABSTRACT("abstract", FieldProperty.MULTILINE_TEXT),
ABSTRACT("abstract"),
ADDENDUM("addendum"),
ADDRESS("address"),
AFTERWORD("afterword", FieldProperty.PERSON_NAMES),
Expand All @@ -28,7 +28,7 @@ public enum StandardField implements Field {
BOOKTITLEADDON("booktitleaddon"),
CHAPTER("chapter"),
COMMENTATOR("commentator", FieldProperty.PERSON_NAMES),
COMMENT("comment", FieldProperty.MULTILINE_TEXT),
COMMENT("comment"),
CROSSREF("crossref", FieldProperty.SINGLE_ENTRY_LINK),
DATE("date", FieldProperty.DATE),
DAY("day"),
Expand Down