Fix column sort order gets overwritten

Fixes #7524
JabRef · Mar 26, 2021 · 4631038 · 4631038
1 parent badffe9
commit 4631038
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 18 deletions.
diff --git a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
@@ -1,14 +1,15 @@
 package org.jabref.gui.maintable;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ColumnPreferences {
 
     public static final double DEFAULT_COLUMN_WIDTH = 100;
     public static final double ICON_COLUMN_WIDTH = 16 + 12; // add some additional space to improve appearance
 
-    private final List<MainTableColumnModel> columns;
-    private final List<MainTableColumnModel> columnSortOrder;
+    private List<MainTableColumnModel> columns;
+    private List<MainTableColumnModel> columnSortOrder = new ArrayList<>();
 
     public ColumnPreferences(List<MainTableColumnModel> columns, List<MainTableColumnModel> columnSortOrder) {
         this.columns = columns;
@@ -22,4 +23,17 @@ public List<MainTableColumnModel> getColumns() {
     public List<MainTableColumnModel> getColumnSortOrder() {
         return columnSortOrder;
     }
+
+    public void setColumns(List<MainTableColumnModel> columns) {
+        this.columns = columns;
+    }
+
+    public void setColumnSorOrder(List<MainTableColumnModel> columnSortOrder) {
+        this.columnSortOrder = columnSortOrder;
+    }
+
+    @Override
+    public String toString() {
+        return "ColumnPreferences [columns=" + columns + ", columnSortOrder=" + columnSortOrder + "]";
+    }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
@@ -213,4 +213,11 @@ public static MainTableColumnModel parse(String rawColumnName) {
 
         return new MainTableColumnModel(type, qualifier);
     }
+
+    @Override
+    public String toString() {
+        return "MainTableColumnModel [typeProperty=" + typeProperty + ", qualifierProperty=" + qualifierProperty + ", widthProperty=" + widthProperty + ", sortTypeProperty=" + sortTypeProperty + "]";
+    }
+
+
 }
diff --git a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
@@ -20,27 +20,35 @@ public PersistenceVisualStateTable(final MainTable mainTable, PreferencesService
         this.preferences = preferences;
 
         mainTable.getColumns().addListener((InvalidationListener) obs -> updateColumnPreferences());
-        mainTable.getSortOrder().addListener((InvalidationListener) obs -> updateColumnPreferences());
+        mainTable.getSortOrder().addListener((InvalidationListener) obs -> updateColSortOrder());
 
         // As we store the ColumnModels of the MainTable, we need to add the listener to the ColumnModel properties,
         // since the value is bound to the model after the listener to the column itself is called.
-        mainTable.getColumns().forEach(col ->
-                ((MainTableColumn<?>) col).getModel().widthProperty().addListener(obs -> updateColumnPreferences()));
-        mainTable.getColumns().forEach(col ->
-                ((MainTableColumn<?>) col).getModel().sortTypeProperty().addListener(obs -> updateColumnPreferences()));
+        mainTable.getColumns().forEach(col -> ((MainTableColumn<?>) col).getModel().widthProperty().addListener(obs -> updateColumnPreferences()));
+        mainTable.getColumns().forEach(col -> ((MainTableColumn<?>) col).getModel().sortTypeProperty().addListener(obs -> updateColumnPreferences()));
+    }
+
+    private void updateColSortOrder() {
+        ColumnPreferences prefs = preferences.getColumnPreferences();
+
+        var sortOrder = mainTable.getSortOrder().stream()
+                        .map(column -> ((MainTableColumn<?>) column).getModel())
+                        .collect(Collectors.toList());
+
+        prefs.setColumnSorOrder(sortOrder);
+        preferences.storeColumnPreferences(prefs);
     }
 
     /**
      * Store shown columns, their width and their sortType in preferences.
      */
     private void updateColumnPreferences() {
-        preferences.storeColumnPreferences(new ColumnPreferences(
-                mainTable.getColumns().stream()
-                         .map(column -> ((MainTableColumn<?>) column).getModel())
-                         .collect(Collectors.toList()),
-                mainTable.getSortOrder().stream()
+
+        ColumnPreferences prefs = preferences.getColumnPreferences();
+        prefs.setColumns(mainTable.getColumns().stream()
                          .map(column -> ((MainTableColumn<?>) column).getModel())
-                         .collect(Collectors.toList())
-        ));
+                         .collect(Collectors.toList()));
+        preferences.storeColumnPreferences(prefs);
+
     }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -1934,10 +1934,11 @@ public void storeColumnPreferences(ColumnPreferences columnPreferences) {
         columnPreferences.getColumns().forEach(column -> columnSortTypesInOrder.add(column.sortTypeProperty().getValue().toString()));
         putStringList(COLUMN_SORT_TYPES, columnSortTypesInOrder);
 
-        putStringList(COLUMN_SORT_ORDER, columnPreferences
-                .getColumnSortOrder().stream()
-                .map(MainTableColumnModel::getName)
-                .collect(Collectors.toList()));
+        var columnSortOrder = columnPreferences
+            .getColumnSortOrder().stream()
+            .map(MainTableColumnModel::getName)
+            .collect(Collectors.toList());
+        putStringList(COLUMN_SORT_ORDER, columnSortOrder);
 
         // Update cache
         mainTableColumns = columnPreferences.getColumns();