From 997b5f352e9aa64c24e3d18e2e1f7e38f5735626 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Thu, 30 Sep 2021 11:13:41 -0400 Subject: [PATCH] GP-1348 removed ChangeListener interface from DataTypeImpl --- .../program/model/data/DataTypeImpl.java | 12 +---- .../program/model/data/EnumDataType.java | 2 - .../data/FunctionDefinitionDataTypeTest.java | 49 +++++++++---------- 3 files changed, 26 insertions(+), 37 deletions(-) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeImpl.java index 57116ad57e..2d10b8fffb 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeImpl.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeImpl.java @@ -19,16 +19,13 @@ import java.lang.ref.WeakReference; import java.util.*; import java.util.function.Consumer; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - import ghidra.docking.settings.*; import ghidra.util.*; /** * Base implementation for dataTypes. */ -public abstract class DataTypeImpl extends AbstractDataType implements ChangeListener { +public abstract class DataTypeImpl extends AbstractDataType { private final static SettingsDefinition[] EMPTY_DEFINITIONS = new SettingsDefinition[0]; protected Settings defaultSettings; @@ -46,7 +43,7 @@ public abstract class DataTypeImpl extends AbstractDataType implements ChangeLis SourceArchive sourceArchive, long lastChangeTime, long lastChangeTimeInSourceArchive, DataTypeManager dataMgr) { super(path, name, dataMgr); - defaultSettings = new SettingsImpl(this, null); + defaultSettings = new SettingsImpl(); parentList = new ArrayList<>(); this.universalID = universalID == null ? UniversalIdGenerator.nextID() : universalID; this.sourceArchive = sourceArchive; @@ -82,11 +79,6 @@ public abstract class DataTypeImpl extends AbstractDataType implements ChangeLis } } - @Override - public void stateChanged(ChangeEvent e) { - // don't care - } - @Override public void setDefaultSettings(Settings settings) { defaultSettings = settings; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java index 02a6b08145..e4f1c82117 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java @@ -222,7 +222,6 @@ public class EnumDataType extends GenericDataType implements Enum { @Override public void setDescription(String description) { this.description = description; - stateChanged(null); } @Override @@ -381,7 +380,6 @@ public class EnumDataType extends GenericDataType implements Enum { for (String name2 : names) { add(name2, enumm.getValue(name2)); } - stateChanged(null); } @Override diff --git a/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/model/data/FunctionDefinitionDataTypeTest.java b/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/model/data/FunctionDefinitionDataTypeTest.java index 718024b2d1..795d55324b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/model/data/FunctionDefinitionDataTypeTest.java +++ b/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/model/data/FunctionDefinitionDataTypeTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.*; import org.junit.*; import generic.test.AbstractGTest; -import ghidra.docking.settings.SettingsImpl; public class FunctionDefinitionDataTypeTest extends AbstractGTest { private StandAloneDataTypeManager dtm; @@ -49,7 +48,7 @@ public class FunctionDefinitionDataTypeTest extends AbstractGTest { assertTrue(impl.getReturnType().isEquivalent(DataType.DEFAULT)); assertEquals(impl.getArguments().length, 0); assertNull(impl.getDataTypeManager()); - assertEquals(impl.getMnemonic(new SettingsImpl(impl, null)), + assertEquals(impl.getMnemonic(null), "undefined testFunctionDefinition(void)"); assertEquals(impl.getPathName(), "/testFunctionDefinition"); @@ -62,7 +61,7 @@ public class FunctionDefinitionDataTypeTest extends AbstractGTest { String rootCat = CategoryPath.ROOT.getPath(); assertEquals(fdtCat, rootCat); assertEquals(fdt.getDataTypeManager(), dtm); - assertEquals(fdt.getMnemonic(new SettingsImpl(impl, null)), + assertEquals(fdt.getMnemonic(null), "undefined testFunctionDefinition(void)"); assertEquals("/testFunctionDefinition", fdt.getPathName()); } @@ -79,7 +78,7 @@ public class FunctionDefinitionDataTypeTest extends AbstractGTest { assertTrue(impl.getReturnType().isEquivalent(DataType.DEFAULT)); assertEquals(impl.getArguments().length, 0); assertEquals(CategoryPath.ROOT, impl.getCategoryPath()); - assertEquals(impl.getMnemonic(new SettingsImpl(impl, null)), + assertEquals(impl.getMnemonic(null), "undefined testFunctionDefinition(void)"); assertEquals(impl.getPathName(), "/testFunctionDefinition"); @@ -92,7 +91,7 @@ public class FunctionDefinitionDataTypeTest extends AbstractGTest { String rootCat = CategoryPath.ROOT.getPath(); assertEquals(fdtCat, rootCat); assertEquals(fdt.getDataTypeManager(), dtm); - assertEquals(fdt.getMnemonic(new SettingsImpl(impl, null)), + assertEquals(fdt.getMnemonic(null), "undefined testFunctionDefinition(void)"); assertEquals(fdt.getPathName(), "/testFunctionDefinition"); } @@ -102,27 +101,27 @@ public class FunctionDefinitionDataTypeTest extends AbstractGTest { FunctionDefinitionDataType impl; FunctionDefinition fdt; FunctionDefinitionDataType sig = new FunctionDefinitionDataType("testFunctionSig"); - sig.setReturnType(DataType.VOID); + sig.setReturnType(VoidDataType.dataType); // sig impl = new FunctionDefinitionDataType(sig); assertEquals(impl.getName(), "testFunctionSig"); assertNull(impl.getComment()); - assertTrue(impl.getReturnType().isEquivalent(DataType.VOID)); + assertTrue(impl.getReturnType().isEquivalent(VoidDataType.dataType)); assertEquals(impl.getArguments().length, 0); assertNull(impl.getDataTypeManager()); - assertEquals("void testFunctionSig(void)", impl.getMnemonic(new SettingsImpl(impl, null))); + assertEquals("void testFunctionSig(void)", impl.getMnemonic(null)); assertEquals(impl.getPathName(), "/testFunctionSig"); fdt = (FunctionDefinition) dtm.resolve(impl, null); assertEquals(fdt.getName(), "testFunctionSig"); assertNull(fdt.getComment()); - assertTrue(fdt.getReturnType().isEquivalent(DataType.VOID)); + assertTrue(fdt.getReturnType().isEquivalent(VoidDataType.dataType)); assertEquals(fdt.getArguments().length, 0); String fdtCat = fdt.getCategoryPath().getPath(); String rootCat = CategoryPath.ROOT.getPath(); assertEquals(fdtCat, rootCat); assertEquals(fdt.getDataTypeManager(), dtm); - assertEquals("void testFunctionSig(void)", fdt.getMnemonic(new SettingsImpl(impl, null))); + assertEquals("void testFunctionSig(void)", fdt.getMnemonic(null)); assertEquals(fdt.getPathName(), "/testFunctionSig"); } @@ -131,27 +130,27 @@ public class FunctionDefinitionDataTypeTest extends AbstractGTest { FunctionDefinitionDataType impl; FunctionDefinition fdt; FunctionDefinitionDataType sig = new FunctionDefinitionDataType("testFunctionSig"); - sig.setReturnType(DataType.VOID); + sig.setReturnType(VoidDataType.dataType); // dtm, sig impl = new FunctionDefinitionDataType(sig); assertEquals(impl.getName(), "testFunctionSig"); assertNull(impl.getComment()); - assertTrue(impl.getReturnType().isEquivalent(DataType.VOID)); + assertTrue(impl.getReturnType().isEquivalent(VoidDataType.dataType)); assertEquals(impl.getArguments().length, 0); - assertEquals("void testFunctionSig(void)", impl.getMnemonic(new SettingsImpl(impl, null))); + assertEquals("void testFunctionSig(void)", impl.getMnemonic(null)); assertEquals(impl.getPathName(), "/testFunctionSig"); fdt = (FunctionDefinition) dtm.resolve(impl, null); assertEquals(fdt.getName(), "testFunctionSig"); assertNull(fdt.getComment()); - assertTrue(fdt.getReturnType().isEquivalent(DataType.VOID)); + assertTrue(fdt.getReturnType().isEquivalent(VoidDataType.dataType)); assertEquals(fdt.getArguments().length, 0); String fdtCat = fdt.getCategoryPath().getPath(); String rootCat = CategoryPath.ROOT.getPath(); assertEquals(fdtCat, rootCat); assertEquals(fdt.getDataTypeManager(), dtm); - assertEquals("void testFunctionSig(void)", fdt.getMnemonic(new SettingsImpl(impl, null))); + assertEquals("void testFunctionSig(void)", fdt.getMnemonic(null)); assertEquals(fdt.getPathName(), "/testFunctionSig"); } @@ -160,27 +159,27 @@ public class FunctionDefinitionDataTypeTest extends AbstractGTest { FunctionDefinitionDataType impl; FunctionDefinition fdt; FunctionDefinitionDataType sig = new FunctionDefinitionDataType("testFunctionSig"); - sig.setReturnType(DataType.VOID); + sig.setReturnType(VoidDataType.dataType); // dtm, name, sig impl = new FunctionDefinitionDataType(CategoryPath.ROOT, "testDtmNameSig", sig); assertEquals(impl.getName(), "testDtmNameSig"); assertNull(impl.getComment()); - assertTrue(impl.getReturnType().isEquivalent(DataType.VOID)); + assertTrue(impl.getReturnType().isEquivalent(VoidDataType.dataType)); assertEquals(impl.getArguments().length, 0); - assertEquals("void testDtmNameSig(void)", impl.getMnemonic(new SettingsImpl(impl, null))); + assertEquals("void testDtmNameSig(void)", impl.getMnemonic(null)); assertEquals(impl.getPathName(), "/testDtmNameSig"); fdt = (FunctionDefinition) dtm.resolve(impl, null); assertEquals(fdt.getName(), "testDtmNameSig"); assertNull(fdt.getComment()); - assertTrue(fdt.getReturnType().isEquivalent(DataType.VOID)); + assertTrue(fdt.getReturnType().isEquivalent(VoidDataType.dataType)); assertEquals(fdt.getArguments().length, 0); String fdtCat = fdt.getCategoryPath().getPath(); String rootCat = CategoryPath.ROOT.getPath(); assertEquals(fdtCat, rootCat); assertEquals(fdt.getDataTypeManager(), dtm); - assertEquals("void testDtmNameSig(void)", fdt.getMnemonic(new SettingsImpl(impl, null))); + assertEquals("void testDtmNameSig(void)", fdt.getMnemonic(null)); assertEquals(fdt.getPathName(), "/testDtmNameSig"); } @@ -189,29 +188,29 @@ public class FunctionDefinitionDataTypeTest extends AbstractGTest { FunctionDefinitionDataType impl; FunctionDefinition fdt; FunctionDefinitionDataType sig = new FunctionDefinitionDataType("testFunctionSig"); - sig.setReturnType(DataType.VOID); + sig.setReturnType(VoidDataType.dataType); FunctionDefinitionDataType functionDefDt = new FunctionDefinitionDataType(sig); // functionDataTypeImpl impl = new FunctionDefinitionDataType(functionDefDt); assertEquals(impl.getName(), "testFunctionSig"); assertNull(impl.getComment()); - assertTrue(impl.getReturnType().isEquivalent(DataType.VOID)); + assertTrue(impl.getReturnType().isEquivalent(VoidDataType.dataType)); assertEquals(impl.getArguments().length, 0); assertNull(null, impl.getDataTypeManager()); - assertEquals("void testFunctionSig(void)", impl.getMnemonic(new SettingsImpl(impl, null))); + assertEquals("void testFunctionSig(void)", impl.getMnemonic(null)); assertEquals(impl.getPathName(), "/testFunctionSig"); fdt = (FunctionDefinition) dtm.resolve(impl, null); assertEquals(fdt.getName(), "testFunctionSig"); assertNull(fdt.getComment()); - assertTrue(fdt.getReturnType().isEquivalent(DataType.VOID)); + assertTrue(fdt.getReturnType().isEquivalent(VoidDataType.dataType)); assertEquals(fdt.getArguments().length, 0); String fdtCat = fdt.getCategoryPath().getPath(); String rootCat = CategoryPath.ROOT.getPath(); assertEquals(fdtCat, rootCat); assertEquals(fdt.getDataTypeManager(), dtm); - assertEquals("void testFunctionSig(void)", fdt.getMnemonic(new SettingsImpl(impl, null))); + assertEquals("void testFunctionSig(void)", fdt.getMnemonic(null)); assertEquals(fdt.getPathName(), "/testFunctionSig"); }