mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-07-30 07:18:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-07-09 15:35:08 -04:00
parent 127b3b6bac 2979c77f1a
commit 5aa3853207
6 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/ColumnTypeMapper.java
View File

@@ -19,7 +19,6 @@ import java.util.List;
import java.util.Objects;
import docking.widgets.table.constraint.provider.NumberColumnConstraintProvider;
import generic.json.Json;
import ghidra.util.classfinder.ExtensionPoint;
import utilities.util.reflection.ReflectionUtilities;
@@ -62,7 +61,7 @@ public abstract class ColumnTypeMapper<T, M> implements ExtensionPoint {
@Override
public String toString() {
return Json.toString(this);
return "[source type=%s, destination type=%s]".formatted(sourceType, destinationType);
}
@Override

3
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java
View File

@@ -17,7 +17,6 @@ package docking.widgets.table.constraint;
import docking.widgets.table.constrainteditor.ColumnConstraintEditor;
import docking.widgets.table.constrainteditor.MappedColumnConstraintEditor;
import generic.json.Json;
import ghidra.util.SystemUtilities;
/**
@@ -103,7 +102,7 @@ public class MappedColumnConstraint<T, M> implements ColumnConstraint<T> {
@Override
public String toString() {
return Json.toString(this);
return delegate.toString();
}
@Override

12
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/ColumnFilterData.java
View File

@@ -17,8 +17,6 @@ package docking.widgets.table.constraint.dialog;
import java.util.*;
import org.apache.commons.collections4.CollectionUtils;
import docking.widgets.table.*;
import docking.widgets.table.constraint.ColumnConstraint;
import docking.widgets.table.constraint.ColumnTypeMapper;
@@ -168,15 +166,7 @@ public class ColumnFilterData<T> implements Comparable<ColumnFilterData<T>> {
@Override
public String toString() {
//@formatter:off
return "{\n" +
"\tname: " + name + ",\n" +
"\tmodelColumn: " + modelIndex + ",\n" +
"\tviewColumn: " + viewIndex + ",\n" +
"\tconstraints: " +
CollectionUtils.collect(applicableConstraints, c -> c.asString()) +"\n" +
"}";
//@formatter:on
return "[name=%s, model col=%s, view col=%s]".formatted(name, modelIndex, viewIndex);
}
/**

8
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterCondition.java
View File

@@ -162,13 +162,7 @@ public class DialogFilterCondition<T> {
@Override
public String toString() {
//@formatter:off
return "{\n" +
"\tname: " + constraintName + ",\n" +
"\teditor: " + editor + "\n" +
// "\tparent: " + parent + "\n" + // stack overflow when DialogFilterConditionSet.toString() is called
"}";
//@formatter:on
return "[name=%s, editor=%s]".formatted(constraintName, editor);
}
private ColumnConstraintEditor<T> buildDummyEditor() {

8
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterConditionSet.java
View File

@@ -168,13 +168,7 @@ public class DialogFilterConditionSet<T> {
@Override
public String toString() {
//@formatter:off
return "{\n" +
// "\tfilterRow: " + filterRow + ",\n" + // stack overflow when DialogFilterRow.toString() is called
"\tdata: " + columnFilterData + ",\n" +
"\tconditions: " + conditionSet +"\n" +
"}";
//@formatter:on
return "[data=%s, conditions=%s]".formatted(columnFilterData, conditionSet);
}
}

11
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterRow.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.
@@ -160,11 +160,6 @@ public class DialogFilterRow {
@Override
public String toString() {
//@formatter:off
return "{\n" +
"\toperation: " + logicOperation + ",\n" +
"\tconditions: " + columnConditionSet +"\n" +
"}";
//@formatter:on
return "[operations=%s, conditions=%s]".formatted(logicOperation, columnConditionSet);
}
}