Skip to content

Commit 92a1c0d

Browse files
committed
Merge remote-tracking branch 'origin/GT-3498-rev308_GTable_Autolookup_fix'
2 parents 5089298 + 2b7af56 commit 92a1c0d

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableAutoLookup.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,26 @@ public String getValueString(int row, int col) {
5555
return obj == null ? null : obj.toString();
5656
}
5757

58+
private boolean isSortableTableModel() {
59+
return table.getModel() instanceof SortedTableModel;
60+
}
61+
5862
@Override
5963
public boolean isSorted(int column) {
64+
if (!isSortableTableModel()) {
65+
return false;
66+
}
67+
6068
SortedTableModel sortedModel = (SortedTableModel) table.getModel();
6169
return column == sortedModel.getPrimarySortColumnIndex();
6270
}
6371

6472
@Override
6573
public boolean isSortedAscending() {
74+
if (!isSortableTableModel()) {
75+
return false;
76+
}
77+
6678
SortedTableModel model = (SortedTableModel) table.getModel();
6779
int primarySortColumnIndex = model.getPrimarySortColumnIndex();
6880
TableSortState columnSortState = model.getTableSortState();

0 commit comments

Comments
 (0)