Update file comparator in property listener

Author: pcastornii

tabshell-dialogs/src/main/java/com/techsenger/tabshell/dialogs/file/FileChooserDialogFxView.java

@@ -37,7 +37,7 @@
 import com.techsenger.tabshell.storage.FileColumnBuilder;
 import com.techsenger.tabshell.storage.FileColumns;
 import com.techsenger.tabshell.storage.GenericFile;
-import java.util.Comparator;
+import com.techsenger.toolkit.fx.value.ValueUtils;
 import java.util.List;
 import java.util.Map;
 import javafx.collections.FXCollections;
@@ -363,11 +363,6 @@ public void editFile(int index) {
         }
     }
 
-    @Override
-    public Comparator<GenericFile> getFileComparator() {
-        return this.fileTableView.getComparator();
-    }
-
     @Override
     public void setFileName(String fileName) {
         this.fileNameTextField.setText(fileName);
@@ -547,6 +542,8 @@ protected void addListeners() {
                 getPresenter().onFileSelected(newV.intValue());
             }
         });
+        ValueUtils.callAndAddListener(this.fileTableView.comparatorProperty(), (ov, oldV, newV) ->
+                getPresenter().onFileComparatorChanged(newV));
         this.filterComboBox.getSelectionModel().selectedItemProperty().addListener((ov, odlV, newV) -> {
             getPresenter().onFilterSelected(newV);
         });

tabshell-dialogs/src/main/java/com/techsenger/tabshell/dialogs/file/FileChooserDialogPresenter.java

@@ -46,6 +46,7 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -107,6 +108,8 @@ private enum EditType {
 
     private final Map<TableColumnName, TableColumnInfo> columns = new HashMap<>();
 
+    private Comparator<GenericFile> fileComparator;
+
     public FileChooserDialogPresenter(V view, FileChooserType type, AppearanceSettings settings,
             HistoryManager historyManager) {
         this(view, type, FileStorages.getAll(true), settings, historyManager);
@@ -524,6 +527,14 @@ protected void onColumnSortIndexChanged(TableColumnName name, Integer index) {
         info.setSortIndex(index);
     }
 
+    protected void onFileComparatorChanged(Comparator<GenericFile> comparator) {
+        this.fileComparator = comparator;
+    }
+
+    protected Comparator<GenericFile> getFileComparator() {
+        return fileComparator;
+    }
+
     private void navigateTo(FileStorage storage, URI uri) {
         this.storage = storage;
         this.directory = uri;
@@ -569,7 +580,7 @@ private void updateFiles(GenericFile selectedFile) {
         if (filteredFiles != null) {
             files = filteredFiles;
         }
-        files.sort(getView().getFileComparator());
+        files.sort(this.fileComparator);
         setFiles(files);
         //only after sorting we can find the selected file index
         this.selectedFileIndex = -1;

tabshell-dialogs/src/main/java/com/techsenger/tabshell/dialogs/file/FileChooserDialogView.java

@@ -23,7 +23,6 @@
 import com.techsenger.tabshell.material.table.TableColumnInfo;
 import com.techsenger.tabshell.material.table.TableColumnName;
 import com.techsenger.tabshell.storage.GenericFile;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -67,8 +66,6 @@ interface Composer extends DialogView.Composer {
 
     void editFile(int index);
 
-    Comparator<GenericFile> getFileComparator();
-
     void setFileName(String fileName);
 
     void setExtensionFilters(List<ExtensionFilter> filters);