Fix HOTableModel.moveColumn illegal argument exception

ho-dev · Nov 8, 2024 · 96630dc · 96630dc
1 parent 5ea0938
commit 96630dc
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/java/core/gui/comp/table/HOTableModel.java b/src/main/java/core/gui/comp/table/HOTableModel.java
@@ -4,6 +4,8 @@
 import core.gui.comp.renderer.HODefaultTableCellRenderer;
 import core.gui.model.UserColumnController;
 import core.model.TranslationFacility;
+import core.util.HOLogger;
+
 import javax.swing.*;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableColumn;
@@ -271,9 +273,14 @@ private void moveColumn(JTable table, UserColumn userColumn) {
 		if (table instanceof FixedColumnsTable fixedColumnsTable) {
 			var targetIndex = userColumn.getIndex() - fixedColumnsTable.getFixedColumnsCount();
 			if (targetIndex > 0) {
-				var index = fixedColumnsTable.getColumnModel().getColumnIndex(userColumn.getId());
-				if (index != targetIndex) {
-					table.moveColumn(index, targetIndex);
+				try {
+					var index = fixedColumnsTable.getColumnModel().getColumnIndex(userColumn.getId());
+					if (index != targetIndex) {
+						table.moveColumn(index, targetIndex);
+					}
+				}
+				catch (IllegalArgumentException e) {
+					HOLogger.instance().info(this.getClass(), "Cannot move column to stored index " + userColumn.id + " " + userColumn.getColumnName() +  " index=" + userColumn.getIndex() + ": " + e.getMessage());
 				}
 			}
 		} else {