Fix sort order in main table not stored

CHANGELOG.md

@@ -33,6 +33,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where the `.sav` file was not deleted upon exiting JabRef. [#6109](https://github.com/JabRef/jabref/issues/6109)
 - We fixed a linked identifier icon inconsistency. [#6705](https://github.com/JabRef/jabref/issues/6705)
 - We fixed the wrong behavior that font size changes are not reflected in dialogs. [#6039](https://github.com/JabRef/jabref/issues/6039)
+- We fixed an issue where the sort order of the entry table was reset after a restart of JabRef [#6898](https://github.com/JabRef/jabref/pull/6898)
 
 ### Removed
 

src/main/java/org/jabref/gui/maintable/MainTable.java

@@ -117,7 +117,20 @@ public MainTable(MainTableDataModel model,
                 .install(this);
 
         this.getSortOrder().clear();
-        mainTablePreferences.getColumnPreferences().getColumnSortOrder().forEach(columnModel ->
+
+        /* KEEP for debugging purposes
+        for (var colModel : mainTablePreferences.getColumnPreferences().getColumnSortOrder()) {
+            for (var col : this.getColumns()) {
+                var tablecColModel = ((MainTableColumn<?>) col).getModel();
+                if (tablecColModel.equals(colModel)) {
+                    LOGGER.debug("Adding sort order for col {} ", col);
+                    this.getSortOrder().add(col);
+                    break;
+                }
+            }
+        }
+        */
+       mainTablePreferences.getColumnPreferences().getColumnSortOrder().forEach(columnModel ->
                 this.getColumns().stream()
                     .map(column -> (MainTableColumn<?>) column)
                     .filter(column -> column.getModel().equals(columnModel))

src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java

@@ -138,7 +138,7 @@ public String getName() {
 
     public String getDisplayName() {
         if ((Type.ICON_COLUMNS.contains(typeProperty.getValue()) && qualifierProperty.getValue().isBlank())
-                || typeProperty.getValue() == Type.INDEX) {
+                || (typeProperty.getValue() == Type.INDEX)) {
             return typeProperty.getValue().getDisplayName();
         } else {
             return FieldsUtil.getNameWithType(FieldFactory.parseField(qualifierProperty.getValue()));
@@ -165,23 +165,25 @@ public ObjectProperty<TableColumn.SortType> sortTypeProperty() {
         return sortTypeProperty;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
 
-        if (o == null || getClass() != o.getClass()) {
+        if ((o == null) || (getClass() != o.getClass())) {
             return false;
         }
 
         MainTableColumnModel that = (MainTableColumnModel) o;
 
-        if (typeProperty != that.typeProperty) {
+        if (typeProperty.getValue() != that.typeProperty.getValue()) {
             return false;
         }
-        return Objects.equals(qualifierProperty, that.qualifierProperty);
+        return Objects.equals(qualifierProperty.getValue(), that.qualifierProperty.getValue());
     }
 
+    @Override
     public int hashCode() {
         return Objects.hash(typeProperty.getValue(), qualifierProperty.getValue());
     }
@@ -199,9 +201,9 @@ public static MainTableColumnModel parse(String rawColumnName) {
         Type type = Type.fromString(splittedName[0]);
         String qualifier = "";
 
-        if (type == Type.NORMALFIELD
-                || type == Type.SPECIALFIELD
-                || type == Type.EXTRAFILE) {
+        if ((type == Type.NORMALFIELD)
+                || (type == Type.SPECIALFIELD)
+                || (type == Type.EXTRAFILE)) {
             if (splittedName.length == 1) {
                 qualifier = splittedName[0]; // By default the rawColumnName is parsed as NORMALFIELD
             } else {