single line text fields

src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java

@@ -85,9 +85,8 @@ private Region setupPanel(BibEntry entry, boolean compressed, SuggestionProvider
         boolean isFirstField = true;
         for (String fieldName : fields) {
             FieldEditorFX fieldEditor = FieldEditors.getForField(fieldName, Globals.TASK_EXECUTOR, dialogService,
-                    Globals.journalAbbreviationLoader, Globals.prefs.getJournalAbbreviationPreferences(), Globals.prefs,
-                    databaseContext, entry.getType(),
-                    suggestionProviders, undoManager);
+                    Globals.journalAbbreviationLoader.getRepository(Globals.prefs.getJournalAbbreviationPreferences()),
+                    Globals.prefs, databaseContext, entry.getType(), suggestionProviders, undoManager);
             fieldEditor.bindToEntry(entry);
 
             editors.put(fieldName, fieldEditor);

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

@@ -0,0 +1,15 @@
+package org.jabref.gui.fieldeditors;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+import javafx.scene.control.MenuItem;
+
+public interface ContextMenuAddable {
+    /**
+     * Adds the given list of menu items to the context menu. The usage of {@link Supplier} prevents that the menus need
+     * to be instantiated at this point. They are populated when the user needs them which prevents many unnecessary
+     * allocations when the main table is just scrolled with the entry editor open.
+     */
+    void addToContextMenu(final Supplier<List<MenuItem>> items);
+}

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

@@ -13,13 +13,13 @@
 
 import com.sun.javafx.scene.control.skin.TextAreaSkin;
 
-public class EditorTextArea extends javafx.scene.control.TextArea implements Initializable {
+public class EditorTextArea extends javafx.scene.control.TextArea implements Initializable, ContextMenuAddable {
 
     public EditorTextArea() {
         this("");
     }
 
-    public EditorTextArea(String text) {
+    public EditorTextArea(final String text) {
         super(text);
 
         setMinHeight(1);
@@ -49,12 +49,8 @@ public EditorTextArea(String text) {
         });
     }
 
-    /**
-     * Adds the given list of menu items to the context menu. The usage of {@link Supplier} prevents that the menus need
-     * to be instantiated at this point. They are populated when the user needs them which prevents many unnecessary
-     * allocations when the main table is just scrolled with the entry editor open.
-     */
-    public void addToContextMenu(Supplier<List<MenuItem>> items) {
+    @Override
+    public void addToContextMenu(final Supplier<List<MenuItem>> items) {
         TextAreaSkin customContextSkin = new TextAreaSkin(this) {
             @Override
             public void populateContextMenu(ContextMenu contextMenu) {

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

@@ -0,0 +1,65 @@
+package org.jabref.gui.fieldeditors;
+
+import java.net.URL;
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.function.Supplier;
+
+import javafx.fxml.Initializable;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+
+import com.sun.javafx.scene.control.skin.TextFieldSkin;
+
+public class EditorTextField extends javafx.scene.control.TextField implements Initializable, ContextMenuAddable {
+
+    public EditorTextField() {
+        this("");
+    }
+
+    public EditorTextField(final String text) {
+        super(text);
+
+        setMinHeight(1);
+        setMinWidth(200);
+
+        // Should behave as a normal text field with respect to TAB behaviour
+        addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            if (event.getCode() == KeyCode.TAB) {
+                TextFieldSkin skin = (TextFieldSkin) getSkin();
+                if (event.isShiftDown()) {
+                    // Shift + Tab > previous text area
+                    skin.getBehavior().traversePrevious();
+                } else {
+                    if (event.isControlDown()) {
+                        // Ctrl + Tab > insert tab
+                        skin.getBehavior().callAction("InsertTab");
+                    } else {
+                        // Tab > next text area
+                        skin.getBehavior().traverseNext();
+                    }
+                }
+                event.consume();
+            }
+        });
+    }
+
+    @Override
+    public void addToContextMenu(final Supplier<List<MenuItem>> items) {
+        TextFieldSkin customContextSkin = new TextFieldSkin(this) {
+            @Override
+            public void populateContextMenu(ContextMenu contextMenu) {
+                super.populateContextMenu(contextMenu);
+                contextMenu.getItems().addAll(0, items.get());
+            }
+        };
+        setSkin(customContextSkin);
+    }
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        // not needed
+    }
+}

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

@@ -1,5 +1,7 @@
 package org.jabref.gui.fieldeditors;
 
+import javafx.scene.control.TextInputControl;
+
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -14,11 +16,11 @@ public EditorValidator(JabRefPreferences preferences) {
         this.preferences = preferences;
     }
 
-    public void configureValidation(ValidationStatus status, EditorTextArea area) {
+    public void configureValidation(final ValidationStatus status, final TextInputControl textInput) {
         if (preferences.getBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR)) {
             ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
             validationVisualizer.setDecoration(new IconValidationDecorator());
-            validationVisualizer.initVisualization(status, area);
+            validationVisualizer.initVisualization(status, textInput);
         }
     }
 }

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

@@ -1,6 +1,9 @@
 package org.jabref.gui.fieldeditors;
 
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -13,8 +16,7 @@
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.integrity.FieldCheckers;
-import org.jabref.logic.journals.JournalAbbreviationLoader;
-import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.FieldProperty;
@@ -25,16 +27,39 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.jabref.model.entry.FieldName.AUTHOR;
+import static org.jabref.model.entry.FieldName.INSTITUTION;
+import static org.jabref.model.entry.FieldName.TITLE;
+import static org.jabref.model.entry.FieldName.YEAR;
+
 public class FieldEditors {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FieldEditors.class);
 
-    public static FieldEditorFX getForField(String fieldName, TaskExecutor taskExecutor, DialogService dialogService, JournalAbbreviationLoader journalAbbreviationLoader, JournalAbbreviationPreferences journalAbbreviationPreferences, JabRefPreferences preferences, BibDatabaseContext databaseContext, String entryType, SuggestionProviders suggestionProviders, UndoManager undoManager) {
+    private static final Set<String> SINGLE_LINE_FIELDS = Collections.unmodifiableSet(new HashSet<>(
+            Arrays.asList(TITLE, AUTHOR, YEAR, INSTITUTION)
+    ));
+
+    public static FieldEditorFX getForField(final String fieldName,
+                                            final TaskExecutor taskExecutor,
+                                            final DialogService dialogService,
+                                            final JournalAbbreviationRepository journalAbbreviationRepository,
+                                            final JabRefPreferences preferences,
+                                            final BibDatabaseContext databaseContext,
+                                            final String entryType,
+                                            final SuggestionProviders suggestionProviders,
+                                            final UndoManager undoManager) {
         final Set<FieldProperty> fieldExtras = InternalBibtexFields.getFieldProperties(fieldName);
 
-        AutoCompleteSuggestionProvider<?> suggestionProvider = getSuggestionProvider(fieldName, suggestionProviders, databaseContext.getMetaData());
+        final AutoCompleteSuggestionProvider<?> suggestionProvider = getSuggestionProvider(fieldName, suggestionProviders, databaseContext.getMetaData());
+
+        final FieldCheckers fieldCheckers = new FieldCheckers(
+                databaseContext,
+                preferences.getFileDirectoryPreferences(),
+                journalAbbreviationRepository,
+                preferences.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
 
-        FieldCheckers fieldCheckers = new FieldCheckers(databaseContext, preferences.getFileDirectoryPreferences(), journalAbbreviationLoader.getRepository(journalAbbreviationPreferences), preferences.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
+        final boolean hasSingleLine = SINGLE_LINE_FIELDS.contains(fieldName.toLowerCase());
 
         if (preferences.getTimestampPreferences().getTimestampField().equals(fieldName) || fieldExtras.contains(FieldProperty.DATE)) {
             if (fieldExtras.contains(FieldProperty.ISO_DATE)) {
@@ -45,7 +70,7 @@ public static FieldEditorFX getForField(String fieldName, TaskExecutor taskExecu
         } else if (fieldExtras.contains(FieldProperty.EXTERNAL)) {
             return new UrlEditor(fieldName, dialogService, suggestionProvider, fieldCheckers, preferences);
         } else if (fieldExtras.contains(FieldProperty.JOURNAL_NAME)) {
-            return new JournalEditor(fieldName, journalAbbreviationLoader, preferences, suggestionProvider, fieldCheckers);
+            return new JournalEditor(fieldName, journalAbbreviationRepository, preferences, suggestionProvider, fieldCheckers);
         } else if (fieldExtras.contains(FieldProperty.DOI) || fieldExtras.contains(FieldProperty.EPRINT) || fieldExtras.contains(FieldProperty.ISBN)) {
             return new IdentifierEditor(fieldName, taskExecutor, dialogService, suggestionProvider, fieldCheckers, preferences);
         } else if (fieldExtras.contains(FieldProperty.OWNER)) {
@@ -71,7 +96,7 @@ public static FieldEditorFX getForField(String fieldName, TaskExecutor taskExecu
         } else if (fieldExtras.contains(FieldProperty.SINGLE_ENTRY_LINK) || fieldExtras.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
             return new LinkedEntriesEditor(fieldName, databaseContext, suggestionProvider, fieldCheckers);
         } else if (fieldExtras.contains(FieldProperty.PERSON_NAMES)) {
-            return new PersonsEditor(fieldName, suggestionProvider, preferences, fieldCheckers);
+            return new PersonsEditor(fieldName, suggestionProvider, preferences, fieldCheckers, hasSingleLine);
         } else if (FieldName.KEYWORDS.equals(fieldName)) {
             return new KeywordsEditor(fieldName, suggestionProvider, fieldCheckers, preferences);
         } else if (fieldExtras.contains(FieldProperty.MULTILINE_TEXT)) {
@@ -81,7 +106,7 @@ public static FieldEditorFX getForField(String fieldName, TaskExecutor taskExecu
         }
 
         // default
-        return new SimpleEditor(fieldName, suggestionProvider, fieldCheckers, preferences);
+        return new SimpleEditor(fieldName, suggestionProvider, fieldCheckers, preferences, hasSingleLine);
     }
 
     @SuppressWarnings("unchecked")

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

@@ -8,7 +8,7 @@
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
 import org.jabref.logic.integrity.FieldCheckers;
-import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -19,8 +19,8 @@ public class JournalEditor extends HBox implements FieldEditorFX {
     @FXML private JournalEditorViewModel viewModel;
     @FXML private EditorTextArea textArea;
 
-    public JournalEditor(String fieldName, JournalAbbreviationLoader journalAbbreviationLoader, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
-        this.viewModel = new JournalEditorViewModel(fieldName, suggestionProvider, journalAbbreviationLoader, preferences.getJournalAbbreviationPreferences(), fieldCheckers);
+    public JournalEditor(String fieldName, JournalAbbreviationRepository journalAbbreviationRepository, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+        this.viewModel = new JournalEditorViewModel(fieldName, suggestionProvider, journalAbbreviationRepository, fieldCheckers);
 
         ViewLoader.view(this)
                   .root(this)

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

@@ -4,30 +4,25 @@
 
 import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
-import org.jabref.logic.journals.JournalAbbreviationLoader;
-import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.strings.StringUtil;
 
 public class JournalEditorViewModel extends AbstractEditorViewModel {
-    private final JournalAbbreviationLoader journalAbbreviationLoader;
-    private final JournalAbbreviationPreferences journalAbbreviationPreferences;
+    private final JournalAbbreviationRepository journalAbbreviationRepository;
 
-    public JournalEditorViewModel(String fieldName, AutoCompleteSuggestionProvider<?> suggestionProvider, JournalAbbreviationLoader journalAbbreviationLoader, JournalAbbreviationPreferences journalAbbreviationPreferences, FieldCheckers fieldCheckers) {
+    public JournalEditorViewModel(String fieldName, AutoCompleteSuggestionProvider<?> suggestionProvider, JournalAbbreviationRepository journalAbbreviationRepository, FieldCheckers fieldCheckers) {
         super(fieldName, suggestionProvider, fieldCheckers);
 
-        this.journalAbbreviationLoader = journalAbbreviationLoader;
-        this.journalAbbreviationPreferences = journalAbbreviationPreferences;
+        this.journalAbbreviationRepository = journalAbbreviationRepository;
     }
 
     public void toggleAbbreviation() {
         if (StringUtil.isBlank(text.get())) {
             return;
         }
 
-        JournalAbbreviationRepository abbreviationRepository = journalAbbreviationLoader.getRepository(journalAbbreviationPreferences);
-        if (abbreviationRepository.isKnownName(text.get())) {
-            Optional<String> nextAbbreviation = abbreviationRepository.getNextAbbreviation(text.get());
+        if (journalAbbreviationRepository.isKnownName(text.get())) {
+            Optional<String> nextAbbreviation = journalAbbreviationRepository.getNextAbbreviation(text.get());
 
             if (nextAbbreviation.isPresent()) {
                 text.set(nextAbbreviation.get());

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

@@ -2,6 +2,7 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
+import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 
@@ -16,20 +17,26 @@ public class PersonsEditor extends HBox implements FieldEditorFX {
 
     @FXML private final PersonsEditorViewModel viewModel;
 
-    private EditorTextArea textArea;
+    private TextInputControl textInput;
 
-    public PersonsEditor(String fieldName, AutoCompleteSuggestionProvider<?> suggestionProvider, JabRefPreferences preferences, FieldCheckers fieldCheckers) {
+    public PersonsEditor(final String fieldName,
+                         final AutoCompleteSuggestionProvider<?> suggestionProvider,
+                         final JabRefPreferences preferences,
+                         final FieldCheckers fieldCheckers,
+                         final boolean hasSingleLine) {
         this.viewModel = new PersonsEditorViewModel(fieldName, suggestionProvider, preferences.getAutoCompletePreferences(), fieldCheckers);
 
-        textArea = new EditorTextArea();
-        HBox.setHgrow(textArea, Priority.ALWAYS);
-        textArea.textProperty().bindBidirectional(viewModel.textProperty());
-        textArea.addToContextMenu(EditorMenus.getNameMenu(textArea));
-        this.getChildren().add(textArea);
+        textInput = hasSingleLine
+                ? new EditorTextField()
+                : new EditorTextArea();
+        HBox.setHgrow(textInput, Priority.ALWAYS);
+        textInput.textProperty().bindBidirectional(viewModel.textProperty());
+        ((ContextMenuAddable) textInput).addToContextMenu(EditorMenus.getNameMenu(textInput));
+        this.getChildren().add(textInput);
 
-        AutoCompletionTextInputBinding.autoComplete(textArea, viewModel::complete, viewModel.getAutoCompletionConverter(), viewModel.getAutoCompletionStrategy());
+        AutoCompletionTextInputBinding.autoComplete(textInput, viewModel::complete, viewModel.getAutoCompletionConverter(), viewModel.getAutoCompletionStrategy());
 
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textInput);
     }
 
     @Override
@@ -44,7 +51,7 @@ public Parent getNode() {
 
     @Override
     public void requestFocus() {
-        textArea.requestFocus();
+        textInput.requestFocus();
     }
 
 }