Fix entry editor field display

src/main/java/org/jabref/gui/PreviewPanel.java

@@ -150,8 +150,7 @@ public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBind
         });
 
         createKeyBindings();
-        updateLayout(preferences);
-
+        updateLayout(preferences, true);
     }
 
     private void createKeyBindings() {
@@ -208,6 +207,10 @@ public void setBasePanel(BasePanel basePanel) {
     }
 
     public void updateLayout(PreviewPreferences previewPreferences) {
+        updateLayout(previewPreferences, false);
+    }
+
+    private void updateLayout(PreviewPreferences previewPreferences, boolean init) {
         if (fixedLayout) {
             LOGGER.debug("cannot change the layout because the layout is fixed");
             return;
@@ -220,12 +223,16 @@ public void updateLayout(PreviewPreferences previewPreferences) {
                 CitationStyle.createCitationStyleFromFile(style)
                              .ifPresent(citationStyle -> {
                                  basePanel.get().getCitationStyleCache().setCitationStyle(citationStyle);
-                                 basePanel.get().output(Localization.lang("Preview style changed to: %0", citationStyle.getTitle()));
+                                 if (!init) {
+                                     basePanel.get().output(Localization.lang("Preview style changed to: %0", citationStyle.getTitle()));
+                                 }
                              });
             }
         } else {
             updatePreviewLayout(previewPreferences.getPreviewStyle(), previewPreferences.getLayoutFormatterPreferences());
-            basePanel.ifPresent(panel -> panel.output(Localization.lang("Preview style changed to: %0", Localization.lang("Preview"))));
+            if (!init) {
+                basePanel.ifPresent(panel -> panel.output(Localization.lang("Preview style changed to: %0", Localization.lang("Preview"))));
+            }
         }
 
         update();

src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml

@@ -2,9 +2,9 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.layout.HBox?>
-<?import org.jabref.gui.fieldeditors.EditorTextArea?>
+<?import org.jabref.gui.fieldeditors.EditorTextField?>
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
          fx:controller="org.jabref.gui.fieldeditors.BibtexKeyEditor">
-    <EditorTextArea fx:id="textArea" prefHeight="0.0" HBox.hgrow="ALWAYS"/>
+    <EditorTextField fx:id="textField"/>
     <Button fx:id="generateCiteKeyButton" styleClass="icon-button"/>
 </fx:root>

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

@@ -23,7 +23,7 @@ public class BibtexKeyEditor extends HBox implements FieldEditorFX {
     private final JabRefPreferences preferences;
     @FXML private BibtexKeyEditorViewModel viewModel;
     @FXML private Button generateCiteKeyButton;
-    @FXML private EditorTextArea textArea;
+    @FXML private EditorTextField textField;
 
     public BibtexKeyEditor(String fieldName, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, BibDatabaseContext databaseContext, UndoManager undoManager, DialogService dialogService) {
         this.preferences = preferences;
@@ -33,9 +33,9 @@ public BibtexKeyEditor(String fieldName, JabRefPreferences preferences, AutoComp
                   .root(this)
                   .load();
 
-        textArea.textProperty().bindBidirectional(viewModel.textProperty());
+        textField.textProperty().bindBidirectional(viewModel.textProperty());
 
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
     }
 
     public BibtexKeyEditorViewModel getViewModel() {

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

@@ -31,7 +31,6 @@ public EditorTextArea() {
     public EditorTextArea(final String text) {
         super(text);
 
-
         // Hide horizontal scrollbar and always wrap text
         setWrapText(true);
 

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

@@ -10,6 +10,8 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
 
 import com.sun.javafx.scene.control.skin.TextFieldSkin;
 
@@ -22,8 +24,9 @@ public EditorTextField() {
     public EditorTextField(final String text) {
         super(text);
 
-        // Always fill out all the available vertical space
-        this.setPrefHeight(Double.POSITIVE_INFINITY);
+        // Always fill out all the available space
+        setPrefHeight(Double.POSITIVE_INFINITY);
+        HBox.setHgrow(this, Priority.ALWAYS);
 
         // Should behave as a normal text field with respect to TAB behaviour
         addEventFilter(KeyEvent.KEY_PRESSED, event -> {

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

@@ -1,6 +1,7 @@
 package org.jabref.gui.fieldeditors;
 
 import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 
 import org.jabref.model.entry.FieldName;
@@ -11,10 +12,7 @@ public FieldNameLabel(String fieldName) {
         super(FieldName.getDisplayName(fieldName));
 
         setPadding(new Insets(4, 0, 0, 0));
-        // TODO: style!
-        //setVerticalAlignment(SwingConstants.TOP);
-        //setForeground(GUIGlobals.ENTRY_EDITOR_LABEL_COLOR);
-        //setBorder(BorderFactory.createEmptyBorder());
+        setAlignment(Pos.CENTER);
+        setPrefHeight(Double.POSITIVE_INFINITY);
     }
-
 }

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

@@ -3,11 +3,11 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
-<?import org.jabref.gui.fieldeditors.EditorTextArea?>
+<?import org.jabref.gui.fieldeditors.EditorTextField?>
 <?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
          fx:controller="org.jabref.gui.fieldeditors.JournalEditor">
-    <EditorTextArea fx:id="textArea" prefHeight="0.0" HBox.hgrow="ALWAYS"/>
+    <EditorTextField fx:id="textField"/>
     <Button onAction="#toggleAbbreviation"
             styleClass="icon-button">
         <graphic>

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

@@ -17,7 +17,7 @@
 public class JournalEditor extends HBox implements FieldEditorFX {
 
     @FXML private JournalEditorViewModel viewModel;
-    @FXML private EditorTextArea textArea;
+    @FXML private EditorTextField textField;
 
     public JournalEditor(String fieldName, JournalAbbreviationRepository journalAbbreviationRepository, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         this.viewModel = new JournalEditorViewModel(fieldName, suggestionProvider, journalAbbreviationRepository, fieldCheckers);
@@ -26,12 +26,12 @@ public JournalEditor(String fieldName, JournalAbbreviationRepository journalAbbr
                   .root(this)
                   .load();
 
-        textArea.textProperty().bindBidirectional(viewModel.textProperty());
-        textArea.addToContextMenu(EditorMenus.getDefaultMenu(textArea));
+        textField.textProperty().bindBidirectional(viewModel.textProperty());
+        textField.addToContextMenu(EditorMenus.getDefaultMenu(textField));
 
-        AutoCompletionTextInputBinding.autoComplete(textArea, viewModel::complete);
+        AutoCompletionTextInputBinding.autoComplete(textField, viewModel::complete);
 
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
     }
 
     public JournalEditorViewModel getViewModel() {

src/main/java/org/jabref/model/entry/InternalBibtexFields.java

@@ -93,8 +93,8 @@ public class InternalBibtexFields {
             SpecialField.RELEVANCE.getFieldName()
     );
 
-    private static final Set<String> SINGLE_LINE_FIELDS = Collections.unmodifiableSet(new HashSet<>(
-            Arrays.asList(FieldName.TITLE, FieldName.AUTHOR, FieldName.YEAR, FieldName.INSTITUTION)
+    private static final Set<String> MULTILINE_FIELDS = Collections.unmodifiableSet(new HashSet<>(
+            Arrays.asList(FieldName.NOTE, FieldName.ABSTRACT, FieldName.COMMENT)
     ));
 
     // singleton instance
@@ -481,6 +481,6 @@ private void add(BibtexSingleField field) {
     }
 
     public static boolean isSingleLineField(final String fieldName) {
-        return SINGLE_LINE_FIELDS.contains(fieldName.toLowerCase());
+        return !MULTILINE_FIELDS.contains(fieldName.toLowerCase());
     }
 }