Reimplement custom entry types dialog

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

@@ -39,7 +39,7 @@ public Object removeRequiredField(Field focusedItem) {
         return null;
     }
 
-    public Object removeOptionalField(Field  focusedItem) {
+    public Object removeOptionalField(Field focusedItem) {
         // TODO Auto-generated method stub
         return null;
     }
@@ -49,6 +49,9 @@ public Object removeOptional2Field(Field focusedItem) {
         return null;
     }
 
-
-
+    public enum FieldType {
+        REQUIRED,
+        PRIMARY_OPTIONAL,
+        SECONDARY_OPTIONAL
+    }
 }

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

@@ -31,49 +31,20 @@
                   </HBox>
                </children>
             </VBox>
-            <VBox prefHeight="200.0" prefWidth="100.0">
+            <VBox prefHeight="200.0" prefWidth="100.0" HBox.hgrow="ALWAYS">
                <children>
-                  <Label text="Required fields" />
+                  <Label text="Required and optional fields" />
                   <TableView fx:id="requiredFields" prefHeight="200.0" prefWidth="200.0">
                     <columns>
                       <TableColumn fx:id="requiredFieldsNameColumn" prefWidth="75.0" text="Field" />
-                      <TableColumn fx:id="requiredFieldsActionColumn" prefWidth="75.0" />
-                    </columns>
-                  </TableView>
-                  <HBox>
-                     <children>
-                        <ComboBox fx:id="addNewRequiredField" editable="true" prefWidth="150.0" />
-                        <Button mnemonicParsing="false" onAction="#addRequiredFields" text="Button" />
-                     </children>
-                  </HBox>
-               </children>
-            </VBox>
-            <VBox prefHeight="200.0" prefWidth="100.0">
-               <children>
-                  <Label text="Optional fields" />
-                  <TableView fx:id="optionalFields" prefHeight="200.0" prefWidth="200.0">
-                    <columns>
-                      <TableColumn fx:id="optionalFieldNameColumn" prefWidth="75.0" text="Field" />
-                      <TableColumn fx:id="optionalFieldActionColumn" prefWidth="75.0" />
-                    </columns>
-                  </TableView>
-                  <HBox>
-                     <children>
-                        <ComboBox fx:id="addOptionalField" editable="true" prefWidth="150.0" />
-                        <Button mnemonicParsing="false" onAction="#addOptionalField" text="add" />
-                     </children>
-                  </HBox>
-                  <Label text="Optional fields 2" />
-                  <TableView fx:id="optionalFields2" prefHeight="200.0" prefWidth="200.0">
-                    <columns>
-                      <TableColumn fx:id="optionalFields2NameColumn" prefWidth="75.0" text="Field" />
-                      <TableColumn fx:id="optionalFields2ActionColumn" prefWidth="75.0" />
+                        <TableColumn fx:id="fieldTypeColumn" prefWidth="75.0" text="Field type" />
+                        <TableColumn fx:id="fieldTypeActionColumn" prefWidth="75.0" />
                     </columns>
                   </TableView>
                   <HBox>
                      <children>
-                        <ComboBox fx:id="addOptionalFields2" editable="true" prefWidth="150.0" />
-                        <Button mnemonicParsing="false" onAction="#addOptionalField2" text="Button" />
+                        <ComboBox fx:id="addNewField" editable="true" prefWidth="150.0" />
+                        <Button mnemonicParsing="false" onAction="#addNewField" text="Button" />
                      </children>
                   </HBox>
                </children>

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

@@ -7,10 +7,7 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 
-import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.ValueTableCellFactory;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.types.EntryType;
@@ -25,19 +22,9 @@ public class CustomizeEntryTypeDialogView extends BaseDialog<Void> {
     @FXML private ComboBox<EntryType> addNewEntryType;
     @FXML private TableView<Field> requiredFields;
     @FXML private TableColumn<Field, String> requiredFieldsNameColumn;
-
-    @FXML private TableColumn<Field, String> requiredFieldsActionColumn;
-    @FXML private ComboBox<Field> addNewRequiredField;
-    @FXML private TableView<Field> optionalFields;
-    @FXML private TableColumn<Field, String> optionalFieldNameColumn;
-    @FXML private TableColumn<Field, String> optionalFieldActionColumn;
-
-    @FXML private ComboBox<Field> addOptionalField;
-    @FXML private TableView<Field> optionalFields2;
-    @FXML private TableColumn<Field, String> optionalFields2NameColumn;
-    @FXML private TableColumn<Field, String> optionalFields2ActionColumn;
-
-    @FXML private ComboBox<Field> addOptionalFields2;
+    @FXML private TableColumn<Field, String> fieldTypeColumn;
+    @FXML private TableColumn<Field, String> fieldTypeActionColumn;
+    @FXML private ComboBox<?> addNewField;
     @FXML private ButtonType applyButton;
 
     private final CustomEntryTypeDialogViewModel viewModel;
@@ -58,53 +45,7 @@ private void initialize() {
 
     private void setupTable() {
         entryTypColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getDisplayName()));
-        requiredFieldsNameColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getDisplayName()));
-        optionalFieldNameColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getDisplayName()));
-        optionalFields2NameColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getDisplayName()));
-
-        new ValueTableCellFactory<EntryType, String>()
-        .withText(name -> name)
-        .install(entryTypColumn);
-
-        new ValueTableCellFactory<EntryType, String>()
-        .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-        .withTooltip(name -> Localization.lang("Remove entry type") + " " + name)
-        .withOnMouseClickedEvent(item -> evt ->
-                viewModel.removeEntryType(entryTypes.getFocusModel().getFocusedItem()))
-        .install(entryTypeActionsColumn);
-
-        new ValueTableCellFactory<Field, String>()
-        .withText(name -> name)
-        .install(requiredFieldsNameColumn);
-
-        new ValueTableCellFactory<Field, String>()
-        .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-        .withTooltip(name -> Localization.lang("Remove required field") + " " + name)
-        .withOnMouseClickedEvent(item -> evt ->
-                viewModel.removeRequiredField(requiredFields.getFocusModel().getFocusedItem()))
-        .install(requiredFieldsActionColumn);
-
-        new ValueTableCellFactory<Field, String>()
-        .withText(name -> name)
-        .install(optionalFieldNameColumn);
-
-        new ValueTableCellFactory<Field, String>()
-        .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-        .withTooltip(name -> Localization.lang("Remove optional field") + " " + name)
-        .withOnMouseClickedEvent(item -> evt ->
-                viewModel.removeOptionalField(optionalFields.getFocusModel().getFocusedItem()))
-        .install(optionalFieldActionColumn);
-
-        new ValueTableCellFactory<Field, String>()
-        .withText(name -> name)
-        .install(optionalFields2NameColumn);
-
-        new ValueTableCellFactory<Field, String>()
-        .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-        .withTooltip(name -> Localization.lang("Remove optional2 field") + " " + name)
-        .withOnMouseClickedEvent(item -> evt ->
-                viewModel.removeOptional2Field(optionalFields2.getFocusModel().getFocusedItem()))
-        .install(optionalFields2ActionColumn);
+
     }
 
     @FXML

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

@@ -0,0 +1,56 @@
+package org.jabref.gui.customentrytypes;
+
+import java.util.EnumSet;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Pos;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.Toggle;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.HBox;
+
+public class RadioButtonCell<S, T extends Enum<T>> extends TableCell<S, T> {
+
+    private final EnumSet<T> enumeration;
+
+    public RadioButtonCell(EnumSet<T> enumeration) {
+        this.enumeration = enumeration;
+    }
+
+    @Override
+    protected void updateItem(T item, boolean empty) {
+        super.updateItem(item, empty);
+        if (!empty) {
+            // gui setup
+            HBox hb = new HBox(7);
+            hb.setAlignment(Pos.CENTER);
+            final ToggleGroup group = new ToggleGroup();
+
+            // create a radio button for each 'element' of the enumeration
+            for (Enum<T> enumElement : enumeration) {
+                RadioButton radioButton = new RadioButton(enumElement.toString());
+                radioButton.setUserData(enumElement);
+                radioButton.setToggleGroup(group);
+                hb.getChildren().add(radioButton);
+                if (enumElement.equals(item)) {
+                    radioButton.setSelected(true);
+                }
+            }
+
+            // issue events on change of the selected radio button
+            group.selectedToggleProperty().addListener(new ChangeListener<Toggle>() {
+
+                @SuppressWarnings("unchecked")
+                @Override
+                public void changed(ObservableValue<? extends Toggle> observable,
+                                    Toggle oldValue, Toggle newValue) {
+                    getTableView().edit(getIndex(), getTableColumn());
+                    RadioButtonCell.this.commitEdit((T) newValue.getUserData());
+                }
+            });
+            setGraphic(hb);
+        }
+    }
+}