Merge remote-tracking branch 'origin/patch'

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<T, M> implements ExtensionPoint {
 
 	@Override
 	public String toString() {
-		return Json.toString(this);
+		return "[source type=%s, destination type=%s]".formatted(sourceType, destinationType);
 	}
 
 	@Override

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<T, M> implements ColumnConstraint<T> {
 
 	@Override
 	public String toString() {
-		return Json.toString(this);
+		return delegate.toString();
 	}
 
 	@Override

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<T> implements Comparable<ColumnFilterData<T>> {
 
 	@Override
 	public String toString() {
-		//@formatter:off
+		return "[name=%s, model col=%s, view col=%s]".formatted(name, modelIndex, viewIndex);
-		return "{\n" +
-			"\tname: " + name + ",\n" +
-			"\tmodelColumn: " + modelIndex + ",\n" +
-			"\tviewColumn: " + viewIndex + ",\n" +
-			"\tconstraints: " + 
-				CollectionUtils.collect(applicableConstraints, c -> c.asString()) +"\n" +
-		"}";
-		//@formatter:on
 	}
 
 	/**

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

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

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

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

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 "[operations=%s, conditions=%s]".formatted(logicOperation, columnConditionSet);
-		return "{\n" +
-			"\toperation: " + logicOperation + ",\n" +
-			"\tconditions: " + columnConditionSet +"\n" +
-		"}";
-		//@formatter:on
 	}
 }