Fix for issue 6601: Add right click menu for main table header

src/main/java/org/jabref/gui/maintable/MainTable.java

@@ -134,6 +134,8 @@ public MainTable(MainTableDataModel model,
 
         this.getSortOrder().clear();
 
+        new MainTableHeaderRightClickMenu().show(this, libraryTab, dialogService);
+
         /* KEEP for debugging purposes
         for (var colModel : mainTablePreferences.getColumnPreferences().getColumnSortOrder()) {
             for (var col : this.getColumns()) {
@@ -149,10 +151,10 @@ public MainTable(MainTableDataModel model,
 
         mainTablePreferences.getColumnPreferences().getColumnSortOrder().forEach(columnModel ->
                 this.getColumns().stream()
-                    .map(column -> (MainTableColumn<?>) column)
-                    .filter(column -> column.getModel().equals(columnModel))
-                    .findFirst()
-                    .ifPresent(column -> this.getSortOrder().add(column)));
+                        .map(column -> (MainTableColumn<?>) column)
+                        .filter(column -> column.getModel().equals(columnModel))
+                        .findFirst()
+                        .ifPresent(column -> this.getSortOrder().add(column)));
 
         if (mainTablePreferences.getResizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
@@ -203,16 +205,16 @@ private void jumpToSearchKey(TableColumn<BibEntryTableViewModel, ?> sortedColumn
         lastKeyPressTime = System.currentTimeMillis();
 
         this.getItems().stream()
-            .filter(item -> Optional.ofNullable(sortedColumn.getCellObservableValue(item).getValue())
-                                    .map(Object::toString)
-                                    .orElse("")
-                                    .toLowerCase()
-                                    .startsWith(columnSearchTerm))
-            .findFirst()
-            .ifPresent(item -> {
-                this.scrollTo(item);
-                this.clearAndSelect(item.getEntry());
-            });
+                .filter(item -> Optional.ofNullable(sortedColumn.getCellObservableValue(item).getValue())
+                        .map(Object::toString)
+                        .orElse("")
+                        .toLowerCase()
+                        .startsWith(columnSearchTerm))
+                .findFirst()
+                .ifPresent(item -> {
+                    this.scrollTo(item);
+                    this.clearAndSelect(item.getEntry());
+                });
     }
 
     @Subscribe
@@ -250,8 +252,8 @@ private void setupKeyBindings(KeyBindingRepository keyBindings) {
         this.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             if (event.getCode() == KeyCode.ENTER) {
                 getSelectedEntries().stream()
-                                    .findFirst()
-                                    .ifPresent(libraryTab::showAndEdit);
+                        .findFirst()
+                        .ifPresent(libraryTab::showAndEdit);
                 event.consume();
                 return;
             }
@@ -436,8 +438,8 @@ public List<BibEntry> getSelectedEntries() {
 
     private Optional<BibEntryTableViewModel> findEntry(BibEntry entry) {
         return model.getEntriesFilteredAndSorted()
-                    .stream()
-                    .filter(viewModel -> viewModel.getEntry().equals(entry))
-                    .findFirst();
+                .stream()
+                .filter(viewModel -> viewModel.getEntry().equals(entry))
+                .findFirst();
     }
 }

src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java

@@ -256,4 +256,45 @@ private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createExtraFileCol
     private TableColumn<BibEntryTableViewModel, String> createLibraryColumn(MainTableColumnModel columnModel) {
         return new LibraryColumn(columnModel);
     }
+
+    /**
+     * Create any single column
+     */
+    public TableColumn<BibEntryTableViewModel, ?> createColumn(MainTableColumnModel columnModel) {
+        switch (columnModel.getType()) {
+            case INDEX:
+                return createIndexColumn(columnModel);
+            case GROUPS:
+                return createGroupColumn(columnModel);
+            case FILES:
+                return createFilesColumn(columnModel);
+            case LINKED_IDENTIFIER:
+                return createIdentifierColumn(columnModel);
+            case LIBRARY_NAME:
+                return createLibraryColumn(columnModel);
+            case EXTRAFILE:
+                if (columnModel.getQualifier().isBlank()) {
+                    return createExtraFileColumn(columnModel);
+                }
+                break;
+            case SPECIALFIELD:
+                if (!columnModel.getQualifier().isBlank()) {
+                    Field field = FieldFactory.parseField(columnModel.getQualifier());
+                    if (field instanceof SpecialField) {
+                        return createSpecialFieldColumn(columnModel);
+                    } else {
+                        LOGGER.warn("Special field type '{}' is unknown. Using normal column type.", columnModel.getQualifier());
+                        return createFieldColumn(columnModel);
+                    }
+                }
+                break;
+            default:
+            case NORMALFIELD:
+                if (!columnModel.getQualifier().isBlank()) {
+                    return createFieldColumn(columnModel);
+                }
+                break;
+        }
+        return null;
+    }
 }

src/main/java/org/jabref/gui/maintable/MainTableHeaderRightClickMenu.java

@@ -0,0 +1,80 @@
+package org.jabref.gui.maintable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.RadioMenuItem;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.TableColumn;
+import javafx.scene.layout.StackPane;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.LibraryTab;
+import org.jabref.gui.maintable.columns.MainTableColumn;
+import org.jabref.gui.preferences.PreferencesDialogView;
+import org.jabref.logic.l10n.Localization;
+
+public class MainTableHeaderRightClickMenu extends ContextMenu {
+    static MainTable mT = null;
+
+    public void show(MainTable mainTable, LibraryTab libraryTab, DialogService dialogService) {
+        System.out.println("show()");
+        mT = mainTable;
+        mainTable.setOnContextMenuRequested(clickEvent -> {
+
+            // Click on the tableColumns
+            if (!(clickEvent.getTarget() instanceof StackPane)) {
+                System.out.println("Click on the tableColumns");
+                // Create radioMenuItemList from tableColumnList
+                List<RadioMenuItem> radioMenuItems = new ArrayList<>();
+                mainTable.getColumns().forEach(tableColumn -> radioMenuItems.add(createRadioMenuItem(tableColumn)));
+
+                SeparatorMenuItem line = new SeparatorMenuItem();
+
+                // Show preferences Button
+                MenuItem columnsPreferences = new MenuItem(Localization.lang("Show preferences"));
+                columnsPreferences.setOnAction(event -> {
+
+                    // Show Entry table
+                    PreferencesDialogView preferencesDialogView = new PreferencesDialogView(libraryTab.frame());
+                    preferencesDialogView.getPreferenceTabList().getSelectionModel().select(3);
+                    dialogService.showCustomDialog(preferencesDialogView);
+                });
+
+                // Clean items and add newItems
+                this.getItems().clear();
+
+                this.getItems().addAll(radioMenuItems);
+                this.getItems().addAll(line, columnsPreferences);
+
+                // Show ContextMenu
+                this.show(mainTable, clickEvent.getScreenX(), clickEvent.getScreenY());
+            }
+
+            clickEvent.consume();
+        });
+    }
+
+    private RadioMenuItem createRadioMenuItem(TableColumn<BibEntryTableViewModel, ?> tableColumn) {
+        RadioMenuItem radioMenuItem = new RadioMenuItem(((MainTableColumn<?>) tableColumn).getDisplayName());
+        // System.out.println(((MainTableColumn<?>) tableColumn).getDisplayName());
+        radioMenuItem.setOnAction(event -> {
+            // Return the column name when we click an item from context menu
+            // System.out.println(((MainTableColumn) tableColumn).getModel().getName());
+            removeColumn(tableColumn);
+        });
+
+        return radioMenuItem;
+    }
+
+    public void addColumn(MainTableColumn column, MainTableColumnFactory creator) {
+        MainTableColumnModel columnModel = column.getModel();
+        creator.createColumn(columnModel);
+    }
+
+    public void removeColumn(TableColumn<BibEntryTableViewModel, ?> tableColumn) {
+        mT.getColumns().removeIf(tableCol -> tableCol == tableColumn);
+    }
+}

src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java

@@ -59,6 +59,10 @@ public PreferencesDialogViewModel getViewModel() {
         return viewModel;
     }
 
+    public ListView<PreferencesTab> getPreferenceTabList() {
+        return preferenceTabList;
+    }
+
     @FXML
     private void initialize() {
         viewModel = new PreferencesDialogViewModel(dialogService, preferencesService, frame);

src/main/java/org/jabref/gui/preferences/table/TableTab.java

@@ -94,7 +94,6 @@ private void setupTable() {
                 event.consume();
             }
         });
-
         columnsList.itemsProperty().bind(viewModel.columnsListProperty());
 
         new ViewModelListCellFactory<MainTableColumnModel>()
@@ -147,4 +146,8 @@ public void sortColumnDown() {
     public void addColumn() {
         viewModel.insertColumnInList();
     }
+
+    public TableView<MainTableColumnModel> getList() {
+        return columnsList;
+    }
 }