From 6f242496f786d64d4be0c2a7b8355f4e10cc7b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Tue, 15 Jan 2019 11:35:31 +0100
Subject: [PATCH] Sort in descending order

---
 .../pmd/util/fxdesigner/model/LogEntry.java            |  8 +++++++-
 .../pmd/util/fxdesigner/popups/EventLogController.java | 10 ++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/LogEntry.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/LogEntry.java
index 1b0ff23eda..99057247ab 100644
--- a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/LogEntry.java
+++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/LogEntry.java
@@ -16,7 +16,7 @@ import org.reactfx.value.Var;
  * @author Clément Fournier
  * @since 6.0.0
  */
-public class LogEntry {
+public class LogEntry implements Comparable<LogEntry> {
 
 
     private final Throwable throwable;
@@ -69,6 +69,12 @@ public class LogEntry {
     }
 
 
+    @Override
+    public int compareTo(LogEntry o) {
+        return getTimestamp().compareTo(o.getTimestamp());
+    }
+
+
     public enum Category {
         PARSE_EXCEPTION("Parse exception"),
         TYPERESOLUTION_EXCEPTION("Type resolution exception"),
diff --git a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/EventLogController.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/EventLogController.java
index 8e14d8333f..f17b8013f4 100644
--- a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/EventLogController.java
+++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/EventLogController.java
@@ -9,6 +9,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.kordamp.ikonli.javafx.FontIcon;
@@ -28,6 +29,7 @@ import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
+import javafx.collections.transformation.SortedList;
 import javafx.css.PseudoClass;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -35,7 +37,6 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableColumn.SortType;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextArea;
@@ -99,6 +100,8 @@ public final class EventLogController extends AbstractController {
 
         logCategoryColumn.setCellValueFactory(new PropertyValueFactory<>("category"));
         logMessageColumn.setCellValueFactory(new PropertyValueFactory<>("message"));
+        logMessageColumn.setSortable(false);
+
         final DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
         logDateColumn.setCellValueFactory(entry -> new SimpleObjectProperty<>(entry.getValue()));
         logDateColumn.setCellFactory(column -> new TableCell<LogEntry, LogEntry>() {
@@ -133,7 +136,6 @@ public final class EventLogController extends AbstractController {
                                                .subtract(logCategoryColumn.getPrefWidth())
                                                .subtract(logDateColumn.getPrefWidth())
                                                .subtract(2)); // makes it work
-        logDateColumn.setSortType(SortType.DESCENDING);
 
         eventLogTableView.setRowFactory(tv -> {
             TableRow<LogEntry> row = new TableRow<>();
@@ -184,8 +186,8 @@ public final class EventLogController extends AbstractController {
             selectedErrorNodes.values().subscribe(mediator::handleSelectedNodeInError)
         );
 
-        eventLogTableView.itemsProperty().setValue(designerRoot.getLogger().getLog());
-
+        SortedList<LogEntry> logEntries = new SortedList<>(designerRoot.getLogger().getLog(), Comparator.reverseOrder());
+        eventLogTableView.itemsProperty().setValue(logEntries);
         binding = binding.and(
             () -> eventLogTableView.itemsProperty().setValue(FXCollections.emptyObservableList())
         );