Create a better solution for define multi line fields

CHANGELOG.md

@@ -11,10 +11,10 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Added
 
+
 - We added a dropdown menu to let users change the library they want to import into during import. [#6177](https://github.com/JabRef/jabref/issues/6177)
 - We added the possibility to add/remove a preview style from the selected list using a double click. [#9490](https://github.com/JabRef/jabref/issues/9490)
-
-
+- We added the option to define fields as "multine" directly in the custom entry types dialog. [#6448](https://github.com/JabRef/jabref/issues/6448)
 
 
 ### Changed

src/main/java/org/jabref/gui/Base.css

@@ -1383,3 +1383,7 @@ We want to have a look that matches our icons in the tool-bar */
 .rating > .container > .button.strong {
     -fx-icon-color: -fx-text-base-color;
 }
+
+.table-column .rotated > .label {
+    -fx-content-display: graphic-only;
+}

src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeDialogViewModel.java

@@ -3,7 +3,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -25,6 +27,7 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.FieldPriority;
+import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.UnknownEntryType;
@@ -64,20 +67,24 @@ public Field fromString(String string) {
 
     private final Validator entryTypeValidator;
     private final Validator fieldValidator;
+    private final Set<Field> multiLineFields = new HashSet<>();
+
+    Predicate<Field> isMultiline = (field) -> this.multiLineFields.contains(field) || field.getProperties().contains(FieldProperty.MULTILINE_TEXT);
 
     public CustomEntryTypeDialogViewModel(BibDatabaseMode mode, PreferencesService preferencesService, BibEntryTypesManager entryTypesManager, DialogService dialogService) {
         this.mode = mode;
         this.preferencesService = preferencesService;
         this.entryTypesManager = entryTypesManager;
         this.dialogService = dialogService;
+        this.multiLineFields.addAll(preferencesService.getFieldContentParserPreferences().getNonWrappableFields());
 
         addAllTypes();
 
         Predicate<String> notEmpty = input -> (input != null) && !input.trim().isEmpty();
         entryTypeValidator = new FunctionBasedValidator<>(entryTypeToAdd, notEmpty, ValidationMessage.error(Localization.lang("Entry type cannot be empty. Please enter a name.")));
         fieldValidator = new FunctionBasedValidator<>(newFieldToAdd,
-                                                      input -> (input != null) && !input.getDisplayName().isEmpty(),
-                                                      ValidationMessage.error(Localization.lang("Field cannot be empty. Please enter a name.")));
+            input -> (input != null) && !input.getDisplayName().isEmpty(),
+            ValidationMessage.error(Localization.lang("Field cannot be empty. Please enter a name.")));
     }
 
     public void addAllTypes() {
@@ -89,9 +96,9 @@ public void addAllTypes() {
         for (BibEntryType entryType : allTypes) {
             EntryTypeViewModel viewModel;
             if (entryTypesManager.isCustomType(entryType.getType(), mode)) {
-                viewModel = new CustomEntryTypeViewModel(entryType);
+                viewModel = new CustomEntryTypeViewModel(entryType, isMultiline);
             } else {
-                viewModel = new EntryTypeViewModel(entryType);
+                viewModel = new EntryTypeViewModel(entryType, isMultiline);
             }
             this.entryTypesWithFields.add(viewModel);
         }
@@ -128,7 +135,8 @@ public String toString() {
 
     public void addNewField() {
         Field field = newFieldToAdd.getValue();
-        FieldViewModel model = new FieldViewModel(field, true, FieldPriority.IMPORTANT);
+        String fieldName = newFieldToAdd.getValue().getName();
+        FieldViewModel model = new FieldViewModel(field, true, FieldPriority.IMPORTANT, false);
         ObservableList<FieldViewModel> entryFields = this.selectedEntryType.getValue().fields();
         boolean fieldExists = entryFields.stream().anyMatch(fieldViewModel -> fieldViewModel.fieldName().getValue().equals(field.getDisplayName()));
 
@@ -143,7 +151,7 @@ public void addNewField() {
     public EntryTypeViewModel addNewCustomEntryType() {
         EntryType newentryType = new UnknownEntryType(entryTypeToAdd.getValue());
         BibEntryType type = new BibEntryType(newentryType, new ArrayList<>(), Collections.emptyList());
-        EntryTypeViewModel viewModel = new CustomEntryTypeViewModel(type);
+        EntryTypeViewModel viewModel = new CustomEntryTypeViewModel(type, isMultiline);
         this.entryTypesWithFields.add(viewModel);
         this.entryTypeToAdd.setValue("");
 
@@ -180,7 +188,7 @@ public void removeEntryType(EntryTypeViewModel focusedItem) {
     }
 
     public void removeField(FieldViewModel focusedItem) {
-       selectedEntryType.getValue().removeField(focusedItem);
+        selectedEntryType.getValue().removeField(focusedItem);
     }
 
     public void resetAllCustomEntryTypes() {
@@ -191,10 +199,14 @@ public void resetAllCustomEntryTypes() {
     }
 
     public void apply() {
-        for (var typeWithField : entryTypesWithFields) {
+        Set<Field> multilineFields = new HashSet<>();
+        for (EntryTypeViewModel typeWithField : entryTypesWithFields) {
             BibEntryType type = typeWithField.entryType().getValue();
             List<FieldViewModel> allFields = typeWithField.fields();
 
+            List<Field> multilineFieldsForType = allFields.stream().map(FieldViewModel::getField).filter(Field::isMultiLineDefined).collect(Collectors.toList());
+            multilineFields.addAll(multilineFieldsForType);
+
             List<OrFields> requiredFields = allFields.stream().filter(field -> field.getFieldType() == FieldType.REQUIRED).map(FieldViewModel::getField).map(OrFields::new).collect(Collectors.toList());
             List<BibField> otherFields = allFields.stream().filter(field -> field.getFieldType() == FieldType.OPTIONAL).map(bibField -> new BibField(bibField.getField(), bibField.getFieldPriority())).collect(Collectors.toList());
 
@@ -206,6 +218,7 @@ public void apply() {
             entryTypesManager.removeCustomOrModifiedEntryType(entryType, mode);
         }
 
+        preferencesService.getImportExportPreferences().setNonWrappableFields(multilineFields.stream().map(Field::getDisplayName).collect(Collectors.joining(";")));
         preferencesService.storeCustomEntryTypes(entryTypesManager);
         // Reload types from preferences to make sure any modifications are present when reopening the dialog
         entryTypesManager.addCustomOrModifiedTypes(preferencesService.getBibEntryTypes(BibDatabaseMode.BIBTEX),

src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeViewModel.java

@@ -1,9 +1,13 @@
 package org.jabref.gui.customentrytypes;
 
+import java.util.function.Predicate;
+
 import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.field.Field;
 
 public class CustomEntryTypeViewModel extends EntryTypeViewModel {
-    public CustomEntryTypeViewModel(BibEntryType entryType) {
-        super(entryType);
+
+    public CustomEntryTypeViewModel(BibEntryType entryType, Predicate<Field> isMultiline) {
+        super(entryType, isMultiline);
     }
 }

src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialog.fxml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.ComboBox?>
@@ -14,87 +13,72 @@
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
 <DialogPane prefHeight="596.0" prefWidth="680"
-            xmlns="http://javafx.com/javafx/8.0.171"
-            xmlns:fx="http://javafx.com/fxml/1"
+            xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="org.jabref.gui.customentrytypes.CustomizeEntryTypeDialogView">
     <content>
         <HBox minHeight="-Infinity" minWidth="-Infinity"
-              prefHeight="400.0" prefWidth="400.0" spacing="10.0">
-            <children>
-                <VBox prefHeight="400.0" prefWidth="100.0" spacing="10.0">
-                    <children>
-                        <Label text="%Entry types"/>
-                        <TableView fx:id="entryTypes" minWidth="-Infinity"
-                                   VBox.vgrow="ALWAYS">
-                            <columns>
-                                <TableColumn fx:id="entryTypColumn" minWidth="100.0"
-                                             prefWidth="100.0" text="%Entry Type"/>
-                                <TableColumn fx:id="entryTypeActionsColumn"
-                                             maxWidth="40.0" minWidth="40.0" resizable="false"/>
-                            </columns>
-                            <columnResizePolicy>
-                                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-                            </columnResizePolicy>
-                        </TableView>
-                        <HBox spacing="10.0">
-                            <children>
-                                <TextField fx:id="addNewEntryType"/>
-                                <Button fx:id="addNewEntryTypeButton" prefHeight="20.0" prefWidth="20.0"
-                                        styleClass="icon-button,narrow" onAction="#addEntryType">
-                                    <graphic>
-                                        <JabRefIconView glyph="ADD_NOBOX"/>
-                                    </graphic>
-                                    <tooltip>
-                                        <Tooltip text="%Add new entry type"/>
-                                    </tooltip>
-                                </Button>
-                            </children>
-                            <VBox.margin>
-                                <Insets/>
-                            </VBox.margin>
-                        </HBox>
-                    </children>
-                </VBox>
-                <VBox prefHeight="400.0" prefWidth="100.0" spacing="10.0"
-                      HBox.hgrow="ALWAYS">
-                    <children>
-                        <Label text="%Required and optional fields"/>
-                        <TableView fx:id="fields" minWidth="-Infinity"
-                                   VBox.vgrow="ALWAYS">
-                            <columns>
-                                <TableColumn fx:id="fieldNameColumn"
-                                             minWidth="150.0" prefWidth="-1.0" text="%Field"/>
-                                <TableColumn fx:id="fieldTypeColumn"
-                                             minWidth="100.0" prefWidth="100.0" text="%Field type"/>
-                                <TableColumn fx:id="fieldTypeActionColumn"
-                                             maxWidth="40.0" minWidth="40.0" resizable="false"/>
-                            </columns>
-                            <columnResizePolicy>
-                                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-                            </columnResizePolicy>
-                        </TableView>
-                        <HBox spacing="10.0">
-                            <children>
-                                <ComboBox fx:id="addNewField" editable="true"
-                                          prefWidth="150.0"/>
-                                <Button fx:id="addNewFieldButton" prefHeight="20.0" prefWidth="20.0"
-                                        styleClass="icon-button,narrow" onAction="#addNewField">
-                                    <graphic>
-                                        <JabRefIconView glyph="ADD_NOBOX"/>
-                                    </graphic>
-                                    <tooltip>
-                                        <Tooltip text="%Add new Field"/>
-                                    </tooltip>
-                                </Button>
-                            </children>
-                        </HBox>
-                    </children>
-                </VBox>
-            </children>
+              prefHeight="400.0" prefWidth="550.0" spacing="10.0">
+            <VBox prefHeight="400.0" prefWidth="100.0" spacing="10.0">
+                <Label text="%Entry types"/>
+                <TableView fx:id="entryTypesTable" minWidth="-Infinity" VBox.vgrow="ALWAYS">
+                    <columns>
+                        <TableColumn fx:id="entryTypColumn"
+                                minWidth="100.0" prefWidth="100.0" text="%Entry Type"/>
+                        <TableColumn fx:id="entryTypeActionsColumn"
+                                maxWidth="40.0" minWidth="40.0" resizable="false"/>
+                    </columns>
+                    <columnResizePolicy>
+                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+                    </columnResizePolicy>
+                </TableView>
+                <HBox spacing="10.0">
+                    <TextField fx:id="addNewEntryType"/>
+                    <Button fx:id="addNewEntryTypeButton"
+                            prefHeight="20.0" prefWidth="20.0"
+                            styleClass="icon-button,narrow" onAction="#addEntryType">
+                        <graphic>
+                            <JabRefIconView glyph="ADD_NOBOX"/>
+                        </graphic>
+                        <tooltip>
+                            <Tooltip text="%Add new entry type"/>
+                        </tooltip>
+                    </Button>
+                </HBox>
+            </VBox>
+            <VBox prefHeight="400.0" prefWidth="400.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                <Label text="%Required and optional fields"/>
+                <TableView fx:id="fields" minWidth="-Infinity" VBox.vgrow="ALWAYS">
+                    <columns>
+                        <TableColumn fx:id="fieldNameColumn"
+                                     minWidth="120.0" text="%Field"/>
+                        <TableColumn fx:id="fieldTypeColumn"
+                                     minWidth="40.0" maxWidth="40.0"/>
+                        <TableColumn fx:id="fieldTypeMultilineColumn"
+                                maxWidth="40.0" minWidth="40.0" resizable="false"/>
+                        <TableColumn fx:id="fieldTypeActionColumn"
+                                     maxWidth="40.0" minWidth="40.0" resizable="false"/>
+                    </columns>
+                    <columnResizePolicy>
+                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+                    </columnResizePolicy>
+                </TableView>
+                <HBox spacing="10.0">
+                    <ComboBox fx:id="addNewField" editable="true" prefWidth="150.0"/>
+                    <Button fx:id="addNewFieldButton"
+                            prefHeight="20.0" prefWidth="20.0"
+                            styleClass="icon-button,narrow" onAction="#addNewField">
+                        <graphic>
+                            <JabRefIconView glyph="ADD_NOBOX"/>
+                        </graphic>
+                        <tooltip>
+                            <Tooltip text="%Add new Field"/>
+                        </tooltip>
+                    </Button>
+                </HBox>
+            </VBox>
         </HBox>
     </content>
-    <ButtonType fx:id="applyButton" buttonData="OK_DONE"
-                text="%Apply"/>
+    <ButtonType fx:id="applyButton" buttonData="OK_DONE" text="%Apply"/>
     <ButtonType fx:constant="CANCEL"/>
     <ButtonType fx:id="resetButton" buttonData="LEFT" text="%Reset" />
 </DialogPane>