GP-4915: Scan view columns, not model columns, to detect Plot removal.

This commit is contained in:
Dan 2025-03-03 17:09:42 +00:00
parent 7e3468a17e
commit 2aedd75059
2 changed files with 9 additions and 8 deletions

View file

@ -42,9 +42,10 @@ public class RangeCursorTableHeaderRenderer<N extends Number & Comparable<N>>
setSavedTable(null); setSavedTable(null);
return true; return true;
} }
int count = model.getColumnCount(); int count = savedTable.getColumnCount();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (model.getColumn(i) == col) { int j = savedTable.convertColumnIndexToModel(i);
if (model.getColumn(j) == col) {
return false; return false;
} }
} }

View file

@ -31,8 +31,8 @@ public interface RowObjectTableModel<T> extends TableModel {
public static TableModel unwrap(TableModel m) { public static TableModel unwrap(TableModel m) {
TableModel model = m; TableModel model = m;
while (model instanceof WrappingTableModel) { while (model instanceof WrappingTableModel wrapper) {
model = ((WrappingTableModel) model).getWrappedModel(); model = wrapper.getWrappedModel();
} }
return model; return model;
} }