Skip to content

Commit b5002e0

Browse files
tobiasdiezstefan-kolb
authored andcommitted
Treat unknown fields as multi-line fields (#5230)
Fixes #5021. Unknown fields are now treated as multi-line fields. In the future, we should provide an UI interface to specify or change properties of fields.
1 parent 71a23e7 commit b5002e0

File tree

5 files changed

+12
-27
lines changed

5 files changed

+12
-27
lines changed

src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,12 @@ public static FieldEditorFX getForField(final Field field,
9090
return new PersonsEditor(field, suggestionProvider, preferences, fieldCheckers, isSingleLine);
9191
} else if (StandardField.KEYWORDS.equals(field)) {
9292
return new KeywordsEditor(field, suggestionProvider, fieldCheckers, preferences);
93-
} else if (fieldProperties.contains(FieldProperty.MULTILINE_TEXT)) {
94-
return new MultilineEditor(field, suggestionProvider, fieldCheckers, preferences);
9593
} else if (field == InternalField.KEY_FIELD) {
9694
return new BibtexKeyEditor(field, preferences, suggestionProvider, fieldCheckers, databaseContext, undoManager, dialogService);
95+
} else {
96+
// default
97+
return new SimpleEditor(field, suggestionProvider, fieldCheckers, preferences, isSingleLine);
9798
}
98-
99-
// default
100-
return new SimpleEditor(field, suggestionProvider, fieldCheckers, preferences, isSingleLine);
10199
}
102100

103101
@SuppressWarnings("unchecked")

src/main/java/org/jabref/gui/fieldeditors/MultilineEditor.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/java/org/jabref/model/entry/field/FieldFactory.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,13 @@ public static List<Field> getDefaultGeneralFields() {
139139
return defaultGeneralFields;
140140
}
141141

142+
// TODO: Move somewhere more appropriate and make user-configurable
142143
public static boolean isSingleLineField(final Field field) {
143-
return !field.getProperties().contains(FieldProperty.MULTILINE_TEXT);
144+
if (field.equals(StandardField.ABSTRACT) || field.equals(StandardField.COMMENT)) {
145+
return false;
146+
}
147+
148+
// Treat unknown fields as multi-line fields
149+
return !(field instanceof UnknownField);
144150
}
145151
}

src/main/java/org/jabref/model/entry/field/FieldProperty.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public enum FieldProperty {
1313
JOURNAL_NAME,
1414
LANGUAGE,
1515
MONTH,
16-
MULTILINE_TEXT,
1716
MULTIPLE_ENTRY_LINK,
1817
NUMERIC,
1918
PAGES,

src/main/java/org/jabref/model/entry/field/StandardField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212
public enum StandardField implements Field {
1313

14-
ABSTRACT("abstract", FieldProperty.MULTILINE_TEXT),
14+
ABSTRACT("abstract"),
1515
ADDENDUM("addendum"),
1616
ADDRESS("address"),
1717
AFTERWORD("afterword", FieldProperty.PERSON_NAMES),
@@ -28,7 +28,7 @@ public enum StandardField implements Field {
2828
BOOKTITLEADDON("booktitleaddon"),
2929
CHAPTER("chapter"),
3030
COMMENTATOR("commentator", FieldProperty.PERSON_NAMES),
31-
COMMENT("comment", FieldProperty.MULTILINE_TEXT),
31+
COMMENT("comment"),
3232
CROSSREF("crossref", FieldProperty.SINGLE_ENTRY_LINK),
3333
DATE("date", FieldProperty.DATE),
3434
DAY("day"),

0 commit comments

Comments
 (0)