[FIX] keep changed header values when switching fixed header option

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java

@@ -47,7 +47,6 @@ public abstract class CsvTableEditor implements FileEditor, FileEditorLocation {
     private Object[][] initialState = null;
     private CsvTableEditorState storedState = null;
 
-    protected CsvColumnInfoMap<PsiElement> columnInfoMap;
     protected boolean tableIsEditable = true;
 
     public CsvTableEditor(@NotNull Project projectArg, @NotNull VirtualFile fileArg) {
@@ -74,15 +73,15 @@ public CsvTableEditor(@NotNull Project projectArg, @NotNull VirtualFile fileArg)
 
     protected abstract void beforeTableComponentUpdate();
 
-    protected abstract void afterTableComponentUpdate();
+    protected abstract void afterTableComponentUpdate(Object[][] values);
 
     public final void updateTableComponentData(Object[][] values) {
         beforeTableComponentUpdate();
         try {
             setTableComponentData(values);
             saveChanges();
         } finally {
-            afterTableComponentUpdate();
+            afterTableComponentUpdate(values);
         }
     }
 
@@ -99,7 +98,13 @@ public boolean isEditable() {
         return this.tableIsEditable && !this.hasErrors();
     }
 
+    public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {
+        CsvFile csvFile = getCsvFile();
+        return csvFile == null ? null : csvFile.getMyColumnInfoMap();
+    }
+
     public boolean hasErrors() {
+        CsvColumnInfoMap columnInfoMap = getColumnInfoMap();
         return !isValid() || (columnInfoMap != null && columnInfoMap.hasErrors());
     }
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.java

@@ -61,6 +61,8 @@ public class CsvTableEditorSwing extends CsvTableEditor implements TableDataChan
 
     private boolean listenerApplied = false;
 
+    private CsvColumnInfoMap lastColumnInfoMap;
+
     public CsvTableEditorSwing(@NotNull Project projectArg, @NotNull VirtualFile fileArg) {
         super(projectArg, fileArg);
 
@@ -102,8 +104,9 @@ private void initializedUIComponents() {
         });
 
         cbFixedHeaders.addActionListener(e -> {
+            Object[][] values = storeCurrentState();
             getFileEditorState().setFixedHeaders(cbFixedHeaders.isSelected());
-            updateTableComponentData(getDataHandler().getCurrentState());
+            updateTableComponentData(values);
         });
 
         tblEditor.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
@@ -159,12 +162,12 @@ public void setTableRowHeight(int rowHeight) {
         this.getTable().setRowHeight(rowHeight == 0 ? ROW_LINE_HEIGHT : rowHeight);
     }
 
-    private Object[] generateColumnIdentifiers(TableModel tableModel) {
+    private Object[] generateColumnIdentifiers(Object[][] values) {
         if (getFileEditorState().getFixedHeaders()) {
-            return getFixedHeaderValues();
+            return values[0];
         }
 
-        int columnCount = tableModel.getColumnCount();
+        int columnCount = values[0].length;
         int columnOffset = CsvEditorSettingsExternalizable.getInstance().isZeroBasedColumnNumbering() ? 0 : 1;
         Object[] identifiers = new Object[columnCount];
         for (int i = 0; i < columnCount; ++i) {
@@ -249,10 +252,10 @@ protected void beforeTableComponentUpdate() {
     }
 
     @Override
-    protected void afterTableComponentUpdate() {
+    protected void afterTableComponentUpdate(Object[][] values) {
         try {
             DefaultTableModel tableModel = this.getTableModel();
-            tableModel.setColumnIdentifiers(generateColumnIdentifiers(tableModel));
+            tableModel.setColumnIdentifiers(generateColumnIdentifiers(values));
             this.updateEditorLayout();
         } finally {
             this.applyTableChangeListener();
@@ -314,12 +317,12 @@ protected void updateUIComponents() {
             return;
         }
 
-        CsvColumnInfoMap<PsiElement> newColumnInfoMap = csvFile.getMyColumnInfoMap();
-        if (Objects.equals(columnInfoMap, newColumnInfoMap)) {
+        CsvColumnInfoMap<PsiElement> columnInfoMap = csvFile.getMyColumnInfoMap();
+        if (Objects.equals(lastColumnInfoMap, columnInfoMap)) {
             return;
         }
 
-        columnInfoMap = newColumnInfoMap;
+        lastColumnInfoMap = columnInfoMap;
         updateInteractionElements();
         DefaultTableModel tableModel = new DefaultTableModel(0, 0);
         if (!columnInfoMap.hasErrors()) {
@@ -385,6 +388,7 @@ protected int[] getCurrentColumnsWidths() {
     }
 
     private Object[] getFixedHeaderValues() {
+        CsvColumnInfoMap columnInfoMap = getColumnInfoMap();
         Object[] headerValues = new Object[columnInfoMap.getColumnInfos().size()];
         if (!columnInfoMap.hasErrors()) {
             for (int i = 0; i < columnInfoMap.getColumnInfos().size(); ++i) {