yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GT-1-dragonmacher-table-copy-bug'

Browse source
This commit is contained in:
ghidravore 2020-09-22 18:05:12 -04:00
commit 12d408d6db
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTable.java
View file

@ -1013,15 +1013,16 @@ public class GTable extends JTable {
return updated; return updated;
} }
private Object getCellValue(int row, int column) { private Object getCellValue(int row, int viewColumn) {
RowObjectTableModel<Object> rowModel = getRowObjectTableModel(); RowObjectTableModel<Object> rowModel = getRowObjectTableModel();
if (rowModel == null) { if (rowModel == null) {
Object value = super.getValueAt(row, column); Object value = super.getValueAt(row, viewColumn);
return maybeConvertValue(value); return maybeConvertValue(value);
} }
Object rowObject = rowModel.getRowObject(row); Object rowObject = rowModel.getRowObject(row);
String stringValue = TableUtils.getTableCellStringValue(rowModel, rowObject, column); int modelColumn = convertColumnIndexToModel(viewColumn);
String stringValue = TableUtils.getTableCellStringValue(rowModel, rowObject, modelColumn);
return maybeConvertValue(stringValue); return maybeConvertValue(stringValue);
} }

2
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableUtils.java
View file

@ -37,7 +37,7 @@ public class TableUtils {
* @param <ROW_OBJECT> The model's row object type * @param <ROW_OBJECT> The model's row object type
* @param model the model * @param model the model
* @param rowObject the row object for the row being queried * @param rowObject the row object for the row being queried
* @param column the column index * @param column the column index <b>in the table model</b>
* @return the string value; null if no value can be fabricated * @return the string value; null if no value can be fabricated
*/ */
public static <ROW_OBJECT> String getTableCellStringValue(RowObjectTableModel<ROW_OBJECT> model, public static <ROW_OBJECT> String getTableCellStringValue(RowObjectTableModel<ROW_OBJECT> model,