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

Minor refactor of table address retrieval and some options constants

Browse source
This commit is contained in:
dragonmacher 2024-10-25 17:41:31 -04:00
parent 7ddd8665b7
commit 5d58d61506
15 changed files with 301 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/MappedTableColumn.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -124,16 +124,16 @@ public class MappedTableColumn<ROW_TYPE, EXPECTED_ROW_TYPE, COLUMN_TYPE, DATA_SO
public COLUMN_TYPE getValue(ROW_TYPE rowObject, Settings settings, DATA_SOURCE data,
ServiceProvider serviceProvider) throws IllegalArgumentException {
if (rowObject == null) {
// can happen when the model is cleared out from under Swing
return null;
}
EXPECTED_ROW_TYPE mappedRowObject = map(rowObject, data, serviceProvider);
return tableColumn.getValue(mappedRowObject, settings, data, serviceProvider);
}
EXPECTED_ROW_TYPE mappedObject = mapper.map(rowObject, data, serviceProvider);
if (mappedObject == null) {
return null; // some mappers have null data
public EXPECTED_ROW_TYPE map(ROW_TYPE rowObject, DATA_SOURCE data,
ServiceProvider serviceProvider) {
if (rowObject == null) {
return null;// can happen when the model is cleared out from under Swing
}
return tableColumn.getValue(mappedObject, settings, data, serviceProvider);
return mapper.map(rowObject, data, serviceProvider);
}
@Override