diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/ColumnTypeMapper.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/ColumnTypeMapper.java index ee7afd82b5..93c8cbfcd3 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/ColumnTypeMapper.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/ColumnTypeMapper.java @@ -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 implements ExtensionPoint { @Override public String toString() { - return Json.toString(this); + return "[source type=%s, destination type=%s]".formatted(sourceType, destinationType); } @Override diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java index 76c7b5ba62..c9208cd8e0 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java @@ -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 implements ColumnConstraint { @Override public String toString() { - return Json.toString(this); + return delegate.toString(); } @Override diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/ColumnFilterData.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/ColumnFilterData.java index 3f35ec7138..23f005153f 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/ColumnFilterData.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/ColumnFilterData.java @@ -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 implements Comparable> { @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); } /** diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterCondition.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterCondition.java index cda6ca16ec..6fe466dfd6 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterCondition.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterCondition.java @@ -162,13 +162,7 @@ public class DialogFilterCondition { @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 buildDummyEditor() { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterConditionSet.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterConditionSet.java index 2af1564c98..a73cbfafa8 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterConditionSet.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterConditionSet.java @@ -168,13 +168,7 @@ public class DialogFilterConditionSet { @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); } } diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterRow.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterRow.java index d4dcde5a0e..cea858e4eb 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterRow.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/dialog/DialogFilterRow.java @@ -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); } }