From 309d05f8da14a4dc89a1d7183b5e42fe84e919cb Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 11 May 2019 12:30:54 +0200 Subject: [PATCH 1/3] Remove UI ThreadList for maintable as it prevents sorting in maintable Fixes #4886 --- src/main/java/org/jabref/gui/maintable/MainTable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java index 10c9a278a2b..382510f4a49 100644 --- a/src/main/java/org/jabref/gui/maintable/MainTable.java +++ b/src/main/java/org/jabref/gui/maintable/MainTable.java @@ -109,7 +109,7 @@ public MainTable(MainTableDataModel model, JabRefFrame frame, } this.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); - this.setItems(BindingsHelper.forUI(model.getEntriesFilteredAndSorted())); + this.setItems(model.getEntriesFilteredAndSorted()); // Enable sorting model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty()); From e45bca5939b8bf89ca7e475946ffc6643b0441e7 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 11 May 2019 12:38:50 +0200 Subject: [PATCH 2/3] fix checkstyle --- src/main/java/org/jabref/gui/maintable/MainTable.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java index 382510f4a49..892116fb337 100644 --- a/src/main/java/org/jabref/gui/maintable/MainTable.java +++ b/src/main/java/org/jabref/gui/maintable/MainTable.java @@ -36,7 +36,6 @@ import org.jabref.gui.keyboard.KeyBindingRepository; import org.jabref.gui.undo.NamedCompound; import org.jabref.gui.undo.UndoableInsertEntry; -import org.jabref.gui.util.BindingsHelper; import org.jabref.gui.util.CustomLocalDragboard; import org.jabref.gui.util.ViewModelTableRowFactory; import org.jabref.logic.l10n.Localization; From 686c124432d6a5c55a68fda7047c358314aa9765 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 11 May 2019 16:57:57 +0200 Subject: [PATCH 3/3] wrap around original entries --- .../java/org/jabref/gui/maintable/MainTableDataModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java index 57d0f4439f1..5ef91744ea9 100644 --- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java +++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java @@ -22,10 +22,10 @@ public class MainTableDataModel { private final SortedList entriesSorted; public MainTableDataModel(BibDatabaseContext context) { - ObservableList allEntries = context.getDatabase().getEntries(); - + ObservableList allEntries = BindingsHelper.forUI(context.getDatabase().getEntries()); + ObservableList entriesViewModel = BindingsHelper.mapBacked(allEntries, BibEntryTableViewModel::new); - + entriesFiltered = new FilteredList<>(entriesViewModel); entriesFiltered.predicateProperty().bind( Bindings.createObjectBinding(() -> this::isMatched,