From 9989f9e768a27fcc65be8047fb1380eba67ef965 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 23 Feb 2018 22:29:35 +0100
Subject: [PATCH] No reordering of items in the maintable via drag and drop
 Rename getEntriesFiltered to better distinguish it

---
 .../java/org/jabref/gui/maintable/MainTable.java | 16 ++++------------
 .../jabref/gui/maintable/MainTableDataModel.java |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 553f22a98b2..f539da7a11a 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -13,7 +13,6 @@
 import javax.swing.undo.UndoManager;
 
 import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableRow;
@@ -111,7 +110,7 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
         }
         this.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
-        this.setItems(model.getEntriesFiltered());
+        this.setItems(model.getEntriesFilteredAndSorted());
 
         // Enable sorting
         model.bindComparator(this.comparatorProperty());
@@ -317,14 +316,7 @@ private void handleOnDragDropped(BibEntryTableViewModel originalItem, DragEvent
 
         boolean success = false;
 
-        ObservableList<BibEntryTableViewModel> items = this.itemsProperty().get();
-
-        if (LocalDragboard.INSTANCE.hasType(DragAndDropDataFormats.BIBENTRY_LIST_CLASS)) {
-            List<BibEntry> parsedEntries = LocalDragboard.INSTANCE.getValue(DragAndDropDataFormats.BIBENTRY_LIST_CLASS);
-            success = true;
-        }
         if (event.getDragboard().hasContent(DataFormat.FILES)) {
-
             List<File> files = event.getDragboard().getFiles();
             System.out.println(files);
         }
@@ -439,7 +431,7 @@ else if (column == 0) {
     */
 
     public BibEntry getEntryAt(int row) {
-        return model.getEntriesFiltered().get(row).getEntry();
+        return model.getEntriesFilteredAndSorted().get(row).getEntry();
     }
 
     public List<BibEntry> getSelectedEntries() {
@@ -573,7 +565,7 @@ private CellRendererMode getCellStatus(int row, int col, boolean checkResolved)
     */
 
     public Optional<BibEntryTableViewModel> findEntry(BibEntry entry) {
-        return model.getEntriesFiltered().stream()
+        return model.getEntriesFilteredAndSorted().stream()
                 .filter(viewModel -> viewModel.getEntry().equals(entry))
                 .findFirst();
     }
@@ -603,7 +595,7 @@ private int isMarked(int row) {
 
     private Optional<BibEntry> getBibEntry(int row) {
         try {
-            return Optional.of(model.getEntriesFiltered().get(row).getEntry());
+            return Optional.of(model.getEntriesFilteredAndSorted().get(row).getEntry());
         } catch (IndexOutOfBoundsException e) {
             return Optional.empty();
         }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index 6ee7c5d7c2d..248e87207f9 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -69,7 +69,7 @@ private Optional<MatcherSet> createGroupMatcher(List<GroupTreeNode> selectedGrou
         return Optional.of(searchRules);
     }
 
-    public ObservableList<BibEntryTableViewModel> getEntriesFiltered() {
+    public ObservableList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
         return entriesSorted;
     }