Sorting of read-status isn't working as expected #4521 (#4536)

* Sorting of read-status isn't working as expected #4521 *Created Comparator for Read Status by adding new class *Added above comparator to read status column Signed-off-by: Aman Jain <[email protected]> * Update CHANGELOG.md Remove redundant code in ReadStatusFieldComparator.java as suggested Signed-off-by: Aman Jain <[email protected]> * Update CHANGELOG.md
JabRef · Dec 14, 2018 · 49c3ef3 · 49c3ef3
1 parent 57d60fa
commit 49c3ef3
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -35,6 +35,7 @@
 import org.jabref.gui.util.OptionalValueTableCellFactory;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.gui.util.comparator.RankingFieldComparator;
+import org.jabref.gui.util.comparator.ReadStatusFieldComparator;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -201,6 +202,11 @@ private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>
             column.setComparator(new RankingFieldComparator());
         }
 
+        // Added comparator for Read Status
+        if (specialField == SpecialField.READ_STATUS) {
+            column.setComparator(new ReadStatusFieldComparator());
+        }
+
         column.setSortable(true);
         return column;
     }

diff --git a/src/main/java/org/jabref/gui/util/comparator/ReadStatusFieldComparator.java b/src/main/java/org/jabref/gui/util/comparator/ReadStatusFieldComparator.java
@@ -0,0 +1,27 @@
+package org.jabref.gui.util.comparator;
+
+import java.util.Comparator;
+import java.util.Optional;
+
+import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
+
+public class ReadStatusFieldComparator implements Comparator<Optional<SpecialFieldValueViewModel>> {
+
+    @Override
+    public int compare(Optional<SpecialFieldValueViewModel> val1, Optional<SpecialFieldValueViewModel> val2) {
+        if (val1.isPresent()) {
+            if (val2.isPresent()) {
+                return val1.get().getValue().compareTo(val2.get().getValue());
+            } else {
+                return -1;
+            }
+        } else {
+            if (val2.isPresent()) {
+                return 1;
+            } else {
+                return 0;
+            }
+        }
+    }
+
+}