Skip to content

Commit 2b7af56

Browse files
author
rev308
committed
GT-3498: Fix for unchecked type casts in table auto-lookup
1 parent 02a6c13 commit 2b7af56

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +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) {
60-
61-
if (table.getModel() instanceof SortedTableModel) {
62-
SortedTableModel sortedModel = (SortedTableModel) table.getModel();
63-
return column == sortedModel.getPrimarySortColumnIndex();
64+
if (!isSortableTableModel()) {
65+
return false;
6466
}
65-
return false;
67+
68+
SortedTableModel sortedModel = (SortedTableModel) table.getModel();
69+
return column == sortedModel.getPrimarySortColumnIndex();
6670
}
6771

6872
@Override
6973
public boolean isSortedAscending() {
74+
if (!isSortableTableModel()) {
75+
return false;
76+
}
77+
7078
SortedTableModel model = (SortedTableModel) table.getModel();
7179
int primarySortColumnIndex = model.getPrimarySortColumnIndex();
7280
TableSortState columnSortState = model.getTableSortState();

0 commit comments

Comments
 (0)