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

GT-2763 - Table Sorting - review fixes

Browse source
This commit is contained in:
dragonmacher 2019-05-08 17:59:39 -04:00
parent 445c7ca03e
commit aa8dc6a491
17 changed files with 81 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/VTMarkupItemsTableModel.java
View file

@ -177,7 +177,7 @@ public class VTMarkupItemsTableModel extends AddressBasedTableModel<VTMarkupItem
// Inner Classes
//==================================================================================================
private class MarkupTablePassthroughFilter implements TableFilter<VTMarkupItem> {
private static class MarkupTablePassthroughFilter implements TableFilter<VTMarkupItem> {
private List<Filter<VTMarkupItem>> appliedFilters;
@ -246,40 +246,17 @@ public class VTMarkupItemsTableModel extends AddressBasedTableModel<VTMarkupItem
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + getEnclosingInstance().hashCode();
result = prime * result + ((appliedFilters == null) ? 0 : appliedFilters.hashCode());
return result;
// not meant to put in hashing structures; the data for equals changes
throw new UnsupportedOperationException();
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
MarkupTablePassthroughFilter other = (MarkupTablePassthroughFilter) obj;
if (!getEnclosingInstance().equals(other.getEnclosingInstance())) {
return false;
}
if (!Objects.equals(appliedFilters, other.appliedFilters)) {
return false;
}
return true;
// For now we don't support equals(); if this filter gets re-created,
// then the table must be re-filtered. If we decide to implement this method, then
// we must also implement equals() on the filters used by this filter.
return this == obj;
}
private VTMarkupItemsTableModel getEnclosingInstance() {
return VTMarkupItemsTableModel.this;
}
}
// column for selecting/editing?

35
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/AbstractVTMatchTableModel.java
View file

@ -137,7 +137,7 @@ public abstract class AbstractVTMatchTableModel extends AddressBasedTableModel<V
//==================================================================================================
// Inner Classes
//==================================================================================================
private class MatchTablePassthroughFilter implements TableFilter<VTMatch> {
private static class MatchTablePassthroughFilter implements TableFilter<VTMatch> {
private List<Filter<VTMatch>> appliedFilters;
@ -206,37 +206,16 @@ public abstract class AbstractVTMatchTableModel extends AddressBasedTableModel<V
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + getEnclosingInstance().hashCode();
result = prime * result + ((appliedFilters == null) ? 0 : appliedFilters.hashCode());
return result;
// not meant to put in hashing structures; the data for equals changes
throw new UnsupportedOperationException();
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
MatchTablePassthroughFilter other = (MatchTablePassthroughFilter) obj;
if (!getEnclosingInstance().equals(other.getEnclosingInstance())) {
return false;
}
if (!Objects.equals(appliedFilters, other.appliedFilters)) {
return false;
}
return true;
}
private AbstractVTMatchTableModel getEnclosingInstance() {
return AbstractVTMatchTableModel.this;
// For now we don't support equals(); if this filter gets re-created,
// then the table must be re-filtered. If we decide to implement this method, then
// we must also implement equals() on the filters used by this filter.
return this == obj;
}
}