Ghidra is a software reverse engineering (SRE) framework
GP-0: Fixing @Override warnings
Ryan Kurtza6cd5b5dbcd1
diff --git a/GPL/DMG/src/dmg/java/mobiledevices/dmg/ghidra/GDataConverterBE.java b/GPL/DMG/src/dmg/java/mobiledevices/dmg/ghidra/GDataConverterBE.javaindex 14f46e28cc..dbec054b6e 100644--- a/GPL/DMG/src/dmg/java/mobiledevices/dmg/ghidra/GDataConverterBE.java+++ b/GPL/DMG/src/dmg/java/mobiledevices/dmg/ghidra/GDataConverterBE.java@@ -24,6 +24,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getShort(byte[])*/+ @Overridepublic final short getShort(byte[] b) {return getShort(b, 0);}@@ -31,6 +32,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getShort(byte[], int)*/+ @Overridepublic short getShort(byte[] b, int offset) {return (short) (((b[offset] & 0xff) << 8) | (b[offset + 1] & 0xff));}@@ -38,6 +40,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getInt(byte[])*/+ @Overridepublic final int getInt(byte[] b) {return getInt(b, 0);}@@ -45,6 +48,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getInt(byte[], int)*/+ @Overridepublic int getInt(byte[] b, int offset) {int v = b[offset];for (int i = 1; i < 4; i++) {@@ -56,6 +60,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getLong(byte[])*/+ @Overridepublic final long getLong(byte[] b) {return getLong(b, 0);}@@ -63,6 +68,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getLong(byte[], int)*/+ @Overridepublic long getLong(byte[] b, int offset) {long v = b[offset];for (int i = 1; i < 8; i++) {@@ -74,6 +80,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#getValue(byte[], int)*/+ @Overridepublic long getValue(byte[] b, int size) {return getValue(b, 0, size);}@@ -81,6 +88,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#getValue(byte[], int, int)*/+ @Overridepublic long getValue(byte[] b, int offset, int size) {if (size > 8) {throw new IndexOutOfBoundsException("size exceeds sizeof long: " + size);@@ -95,6 +103,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getBytes(short, byte[])*/+ @Overridepublic final void getBytes(short value, byte[] b) {getBytes(value, b, 0);}@@ -102,6 +111,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getBytes(short, byte[], int)*/+ @Overridepublic void getBytes(short value, byte[] b, int offset) {b[offset] = (byte) (value >> 8);b[offset + 1] = (byte) (value & 0xff);@@ -110,6 +120,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getBytes(int, byte[])*/+ @Overridepublic final void getBytes(int value, byte[] b) {getBytes(value, b, 0);}@@ -117,6 +128,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getBytes(int, byte[], int)*/+ @Overridepublic void getBytes(int value, byte[] b, int offset) {b[offset + 3] = (byte) (value);for (int i = 2; i >= 0; i--) {@@ -128,6 +140,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getBytes(long, byte[])*/+ @Overridepublic final void getBytes(long value, byte[] b) {getBytes(value, 8, b, 0);}@@ -135,6 +148,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter#getBytes(long, byte[], int)*/+ @Overridepublic void getBytes(long value, byte[] b, int offset) {getBytes(value, 8, b, offset);}@@ -142,6 +156,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#getBytes(long, int, byte[], int)*/+ @Overridepublic void getBytes(long value, int size, byte[] b, int offset) {for (int i = size - 1; i >= 0; i--) {b[offset + i] = (byte) value;@@ -152,6 +167,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#putInt(byte[], int, int)*/+ @Overridepublic final void putInt(byte[] b, int offset, int value) {getBytes(value, b, offset);}@@ -159,6 +175,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#putInt(byte[], int)*/+ @Overridepublic final void putInt(byte[] b, int value) {getBytes(value, b);}@@ -166,6 +183,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#putLong(byte[], int, long)*/+ @Overridepublic final void putLong(byte[] b, int offset, long value) {getBytes(value, b, offset);}@@ -173,6 +191,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#putLong(byte[], long)*/+ @Overridepublic final void putLong(byte[] b, long value) {getBytes(value, b);}@@ -180,6 +199,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#putShort(byte[], int, short)*/+ @Overridepublic final void putShort(byte[] b, int offset, short value) {getBytes(value, b, offset);}@@ -187,6 +207,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#putShort(byte[], short)*/+ @Overridepublic final void putShort(byte[] b, short value) {getBytes(value, b);}@@ -194,6 +215,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#getBytes(int)*/+ @Overridepublic byte[] getBytes(int value) {byte[] bytes = new byte[4];getBytes(value, bytes);@@ -203,6 +225,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#getBytes(long)*/+ @Overridepublic byte[] getBytes(long value) {byte[] bytes = new byte[8];getBytes(value, bytes);@@ -212,6 +235,7 @@ public class GDataConverterBE implements GDataConverter {/*** @see GDataConverter.util.DataConverter#getBytes(short)*/+ @Overridepublic byte[] getBytes(short value) {byte[] bytes = new byte[2];getBytes(value, bytes);diff --git a/GPL/DMG/src/dmg/java/mobiledevices/dmg/ghidra/GDataConverterLE.java b/GPL/DMG/src/dmg/java/mobiledevices/dmg/ghidra/GDataConverterLE.javaindex 9c26f6b344..9489ae2534 100644--- a/GPL/DMG/src/dmg/java/mobiledevices/dmg/ghidra/GDataConverterLE.java+++ b/GPL/DMG/src/dmg/java/mobiledevices/dmg/ghidra/GDataConverterLE.java@@ -23,6 +23,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getShort(byte[])*/+ @Overridepublic final short getShort(byte[] b) {return getShort(b, 0);}@@ -30,6 +31,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getShort(byte[], int)*/+ @Overridepublic short getShort(byte[] b, int offset) {return (short) (((b[offset + 1] & 0xff) << 8) | (b[offset] & 0xff));}@@ -37,6 +39,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getInt(byte[])*/+ @Overridepublic final int getInt(byte[] b) {return getInt(b, 0);}@@ -44,6 +47,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getInt(byte[], int)*/+ @Overridepublic int getInt(byte[] b, int offset) {int v = b[offset + 3];for (int i = 2; i >= 0; i--) {@@ -55,6 +59,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getLong(byte[])*/+ @Overridepublic final long getLong(byte[] b) {return getLong(b, 0);}@@ -62,6 +67,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getLong(byte[], int)*/+ @Overridepublic long getLong(byte[] b, int offset) {long v = b[offset + 7];for (int i = 6; i >= 0; i--) {@@ -73,6 +79,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#getValue(byte[], int)*/+ @Overridepublic long getValue(byte[] b, int size) {return getValue(b, 0, size);}@@ -80,6 +87,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#getValue(byte[], int, int)*/+ @Overridepublic long getValue(byte[] b, int offset, int size) {if (size > 8) {throw new IndexOutOfBoundsException("size exceeds sizeof long: " + size);@@ -94,6 +102,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getBytes(short, byte[])*/+ @Overridepublic final void getBytes(short value, byte[] b) {getBytes(value, b, 0);}@@ -101,6 +110,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getBytes(short, byte[], int)*/+ @Overridepublic void getBytes(short value, byte[] b, int offset) {b[offset + 1] = (byte) (value >> 8);b[offset] = (byte) (value & 0xff);@@ -109,6 +119,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getBytes(int, byte[])*/+ @Overridepublic final void getBytes(int value, byte[] b) {getBytes(value, b, 0);}@@ -116,6 +127,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getBytes(int, byte[], int)*/+ @Overridepublic void getBytes(int value, byte[] b, int offset) {b[offset] = (byte) (value);for (int i = 1; i < 4; i++) {@@ -127,6 +139,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getBytes(long, byte[])*/+ @Overridepublic final void getBytes(long value, byte[] b) {getBytes(value, 8, b, 0);}@@ -134,6 +147,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see GDataConverter#getBytes(long, byte[], int)*/+ @Overridepublic void getBytes(long value, byte[] b, int offset) {getBytes(value, 8, b, offset);}@@ -141,6 +155,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#getBytes(long, int, byte[], int)*/+ @Overridepublic void getBytes(long value, int size, byte[] b, int offset) {for (int i = 0; i < size; i++) {b[offset + i] = (byte) value;@@ -151,6 +166,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#putInt(byte[], int, int)*/+ @Overridepublic final void putInt(byte[] b, int offset, int value) {getBytes(value, b, offset);}@@ -158,6 +174,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#putInt(byte[], int)*/+ @Overridepublic final void putInt(byte[] b, int value) {getBytes(value, b);}@@ -165,6 +182,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#putLong(byte[], int, long)*/+ @Overridepublic final void putLong(byte[] b, int offset, long value) {getBytes(value, b, offset);}@@ -172,6 +190,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#putLong(byte[], long)*/+ @Overridepublic final void putLong(byte[] b, long value) {getBytes(value, b);}@@ -179,6 +198,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#putShort(byte[], int, short)*/+ @Overridepublic final void putShort(byte[] b, int offset, short value) {getBytes(value, b, offset);}@@ -186,6 +206,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#putShort(byte[], short)*/+ @Overridepublic final void putShort(byte[] b, short value) {getBytes(value, b);}@@ -193,6 +214,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#getBytes(int)*/+ @Overridepublic byte[] getBytes(int value) {byte[] bytes = new byte[4];getBytes(value, bytes);@@ -202,6 +224,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#getBytes(long)*/+ @Overridepublic byte[] getBytes(long value) {byte[] bytes = new byte[8];getBytes(value, bytes);@@ -211,6 +234,7 @@ public class GDataConverterLE implements GDataConverter {/*** @see ghidra.util.GDataConverter#getBytes(short)*/+ @Overridepublic byte[] getBytes(short value) {byte[] bytes = new byte[2];getBytes(value, bytes);diff --git a/Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/AbstractIsfWriter.java b/Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/AbstractIsfWriter.javaindex 00286cd8a9..0680c64195 100644--- a/Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/AbstractIsfWriter.java+++ b/Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/AbstractIsfWriter.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.@@ -98,6 +98,7 @@ public abstract class AbstractIsfWriter implements Closeable {gson.toJson(object, writer);}+ @Overridepublic void close() throws IOException {if (writer != null) {writer.flush();diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/memory/TraceObjectMemoryRegion.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/memory/TraceObjectMemoryRegion.javaindex 447df47de7..62695177a7 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/memory/TraceObjectMemoryRegion.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/memory/TraceObjectMemoryRegion.java@@ -49,10 +49,13 @@ public interface TraceObjectMemoryRegion extends TraceMemoryRegion, TraceObjectIvoid setRange(Lifespan lifespan, AddressRange range);+ @OverrideAddressRange getRange(long snap);+ @OverrideAddress getMinAddress(long snap);+ @OverrideAddress getMaxAddress(long snap);void setFlags(Lifespan lifespan, Collection<TraceMemoryFlag> flags);@@ -61,5 +64,6 @@ public interface TraceObjectMemoryRegion extends TraceMemoryRegion, TraceObjectIvoid clearFlags(Lifespan lifespan, Collection<TraceMemoryFlag> flags);+ @OverrideSet<TraceMemoryFlag> getFlags(long snap);}diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/rect/Rectangle2D.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/rect/Rectangle2D.javaindex c201ed4b07..2311bf5c4a 100644--- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/rect/Rectangle2D.java+++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/rect/Rectangle2D.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.@@ -186,6 +186,7 @@ public interface Rectangle2D<X, Y, R extends Rectangle2D<X, Y, R>> extends Bound* @param shape the other (presumably-inner) rectangle* @return true if this rectangle encloses the other*/+ @Overridedefault boolean encloses(R shape) {return encloses(this, shape);}diff --git a/Ghidra/Extensions/sample/src/main/java/ghidra/examples/graph/layout/SampleGraphLayoutProvider.java b/Ghidra/Extensions/sample/src/main/java/ghidra/examples/graph/layout/SampleGraphLayoutProvider.javaindex 9e09fefab3..6b39461813 100644--- a/Ghidra/Extensions/sample/src/main/java/ghidra/examples/graph/layout/SampleGraphLayoutProvider.java+++ b/Ghidra/Extensions/sample/src/main/java/ghidra/examples/graph/layout/SampleGraphLayoutProvider.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.@@ -40,6 +40,7 @@ public abstract class SampleGraphLayoutProviderpublic abstract VisualGraphLayout<SampleVertex, SampleEdge> getLayout(SampleGraph g,TaskMonitor monitor) throws CancelledException;+ @Overrideprotected void initVertexLocations(SampleGraph g, Layout<SampleVertex, SampleEdge> layout) {Collection<SampleVertex> vertices = g.getVertices();for (SampleVertex v : vertices) {diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/MultiChoiceBSimValueEditor.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/MultiChoiceBSimValueEditor.javaindex 8071100c28..94cbff7f13 100644--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/MultiChoiceBSimValueEditor.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/MultiChoiceBSimValueEditor.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.@@ -145,6 +145,7 @@ public class MultiChoiceBSimValueEditor implements BSimValueEditor {return component;}+ @Overridepublic boolean hasValidValues() {return isValid;}diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/StringBSimValueEditor.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/StringBSimValueEditor.javaindex 27e3db21f5..ee2263c8c4 100644--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/StringBSimValueEditor.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/StringBSimValueEditor.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.@@ -105,6 +105,7 @@ public class StringBSimValueEditor implements BSimValueEditor {return textField;}+ @Overridepublic boolean hasValidValues() {return isValid;}diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/BSimSearchDialog.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/BSimSearchDialog.javaindex 9b9318638e..ed17da28f2 100644--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/BSimSearchDialog.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/BSimSearchDialog.java@@ -93,6 +93,7 @@ public class BSimSearchDialog extends AbstractBSimSearchDialog {}}+ @Overrideprotected JPanel buildServerPanel() {JPanel panel = super.buildServerPanel();panel.add(new JLabel("Function(s): "));@@ -100,6 +101,7 @@ public class BSimSearchDialog extends AbstractBSimSearchDialog {return panel;}+ @Overrideprotected JPanel buildCenterPanel() {filterPanel = new BSimFilterPanel(this::filterPanelChanged);return createTitledPanel("Filters:", filterPanel, true);diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/IDElasticResolution.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/IDElasticResolution.javaindex c8961c9e5a..3469da961a 100755--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/IDElasticResolution.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/IDElasticResolution.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.@@ -32,6 +32,7 @@ public abstract class IDElasticResolution {idString = null;}+ @Overridepublic void resolve(ElasticDatabase database,ExecutableRecord exe) throws ElasticException {if (idString == null)idString = database.recoverExternalFunctionId(exeName, funcName, exe.getArchitecture());diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/protocol/AdjustVectorIndex.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/protocol/AdjustVectorIndex.javaindex 85ef646bcd..497c4414fa 100755--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/protocol/AdjustVectorIndex.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/protocol/AdjustVectorIndex.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.@@ -41,6 +41,7 @@ public class AdjustVectorIndex extends BSimQuery<ResponseAdjustIndex> {/* (non-Javadoc)* @see ghidra.query.protocol.QueryResponseRecord#buildResponseTemplate()*/+ @Overridepublic void buildResponseTemplate() {if (response == null)response = adjustresponse = new ResponseAdjustIndex();diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/protocol/ChildAtom.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/protocol/ChildAtom.javaindex dc1c592062..5d2b170b69 100755--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/protocol/ChildAtom.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/protocol/ChildAtom.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.@@ -27,6 +27,7 @@ public class ChildAtom extends FilterAtom {public String name = null; // Name of the child functionpublic String exename = null; // Name of the executable (or library) containing the child (or null)+ @Overridepublic void saveXml(Writer fwrite) throws IOException {fwrite.append("<childatom");type.saveXml(fwrite);@@ -49,6 +50,7 @@ public class ChildAtom extends FilterAtom {name = parser.end(el).getText();}+ @Overridepublic FilterAtom clone() {ChildAtom newatom = new ChildAtom();newatom.type = type;@@ -58,6 +60,7 @@ public class ChildAtom extends FilterAtom {return newatom;}+ @Overridepublic String getInfoString() {if (name == null)return null;diff --git a/Ghidra/Features/Base/ghidra_scripts/GenerateMaskedBitStringScript.java b/Ghidra/Features/Base/ghidra_scripts/GenerateMaskedBitStringScript.javaindex f667ef3206..6e5a2255d8 100644--- a/Ghidra/Features/Base/ghidra_scripts/GenerateMaskedBitStringScript.java+++ b/Ghidra/Features/Base/ghidra_scripts/GenerateMaskedBitStringScript.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -20,6 +19,7 @@ import ghidra.program.model.mem.Memory;public class GenerateMaskedBitStringScript extends GhidraScript {+ @Overridepublic void run() throws Exception {Memory mem = currentProgram.getMemory();diff --git a/Ghidra/Features/Base/ghidra_scripts/ReportDisassemblyErrors.java b/Ghidra/Features/Base/ghidra_scripts/ReportDisassemblyErrors.javaindex 24933d8d3e..3a63f13924 100644--- a/Ghidra/Features/Base/ghidra_scripts/ReportDisassemblyErrors.java+++ b/Ghidra/Features/Base/ghidra_scripts/ReportDisassemblyErrors.java@@ -29,7 +29,8 @@ import java.util.Iterator;public class ReportDisassemblyErrors extends GhidraScript {- public void run() throws Exception {+ @Override+ public void run() throws Exception {Program prog = currentProgram;Iterator<Bookmark> bookmarkIter = prog.getBookmarkManager().getBookmarksIterator("Error");int count = 0;diff --git a/Ghidra/Features/Base/ghidra_scripts/TurnOffStackAnalysis.java b/Ghidra/Features/Base/ghidra_scripts/TurnOffStackAnalysis.javaindex 8d31a0b4d1..888da99dad 100644--- a/Ghidra/Features/Base/ghidra_scripts/TurnOffStackAnalysis.java+++ b/Ghidra/Features/Base/ghidra_scripts/TurnOffStackAnalysis.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.@@ -23,6 +23,7 @@ import ghidra.app.script.GhidraScript;public class TurnOffStackAnalysis extends GhidraScript {+ @Overridepublic void run() throws Exception {setAnalysisOption(currentProgram, "Stack", "false");diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/analyzers/AbstractBinaryFormatAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/analyzers/AbstractBinaryFormatAnalyzer.javaindex 5aca55a3d0..70c449bfd6 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/analyzers/AbstractBinaryFormatAnalyzer.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/analyzers/AbstractBinaryFormatAnalyzer.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.@@ -32,6 +32,7 @@ public abstract class AbstractBinaryFormatAnalyzer extends AbstractAnalyzer {this.command = command;}+ @Overridefinal public boolean added(Program program, AddressSetView set, TaskMonitor monitor,MessageLog log) throws CancelledException {@@ -48,10 +49,12 @@ public abstract class AbstractBinaryFormatAnalyzer extends AbstractAnalyzer {return false;}+ @Overridefinal public boolean canAnalyze(Program program) {return command.canApply(program);}+ @Overridefinal public boolean getDefaultEnablement(Program program) {return command.canApply(program);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/memory/MoveBlockTask.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/memory/MoveBlockTask.javaindex b19732b2ef..fc6837096e 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/memory/MoveBlockTask.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/memory/MoveBlockTask.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.@@ -101,6 +101,7 @@ public class MoveBlockTask extends ProgramTask {throw new RollbackException(statusMessage, cause);}+ @Overridepublic boolean isCancelled() {return cancelled;}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/UserDefinedPropertyMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/UserDefinedPropertyMerger.javaindex c33250c266..2dc0ea44d8 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/UserDefinedPropertyMerger.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/UserDefinedPropertyMerger.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.@@ -406,6 +406,7 @@ class UserDefinedPropertyMerger extends AbstractListingMerger {this.currentAddress = addr;try {final ChangeListener changeListener = new ChangeListener() {+ @Overridepublic void stateChanged(ChangeEvent e) {conflictOption = conflictPanel.getSelectedOptions();if (conflictOption == ASK_USER) {@@ -425,12 +426,14 @@ class UserDefinedPropertyMerger extends AbstractListingMerger {}};SwingUtilities.invokeAndWait(new Runnable() {+ @Overridepublic void run() {setupConflictsPanel(listingPanel, UserDefinedPropertyMerger.this.propertyName,UserDefinedPropertyMerger.this.currentAddress, changeListener);}});SwingUtilities.invokeLater(new Runnable() {+ @Overridepublic void run() {listingPanel.clearAllBackgrounds();listingPanel.paintAllBackgrounds(new AddressSet(addr, addr));diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.javaindex 76dc92eec8..96272f4482 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.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.@@ -86,6 +86,7 @@ public class PropertyListMergeManager implements MergeResolver {/* (non-Javadoc)* @see ghidra.app.merge.MergeResolver#apply()*/+ @Overridepublic void apply() {conflictOption = mergePanel.getSelectedOption();@@ -99,6 +100,7 @@ public class PropertyListMergeManager implements MergeResolver {/* (non-Javadoc)* @see ghidra.app.merge.MergeResolver#cancel()*/+ @Overridepublic void cancel() {conflictOption = CANCELED;}@@ -106,6 +108,7 @@ public class PropertyListMergeManager implements MergeResolver {/* (non-Javadoc)* @see ghidra.app.merge.MergeResolver#getDescription()*/+ @Overridepublic String getDescription() {return "Merge Property Lists";}@@ -113,6 +116,7 @@ public class PropertyListMergeManager implements MergeResolver {/* (non-Javadoc)* @see ghidra.app.merge.MergeResolver#getName()*/+ @Overridepublic String getName() {return "Property List Merger";}@@ -120,6 +124,7 @@ public class PropertyListMergeManager implements MergeResolver {/* (non-Javadoc)* @see ghidra.app.merge.MergeResolver#merge(ghidra.util.task.TaskMonitor)*/+ @Overridepublic void merge(TaskMonitor monitor) {mergeManager.setInProgress(PROPERTY_LIST_PHASE);@@ -457,6 +462,7 @@ public class PropertyListMergeManager implements MergeResolver {final int totalNumConflicts) {try {SwingUtilities.invokeAndWait(new Runnable() {+ @Overridepublic void run() {if (mergePanel == null) {mergePanel = new PropertyListMergePanel(mergeManager, totalNumConflicts);@@ -478,6 +484,7 @@ public class PropertyListMergeManager implements MergeResolver {// and continue.}+ @Overridepublic String[][] getPhases() {return new String[][] { PROPERTY_LIST_PHASE };}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergePanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergePanel.javaindex 16f140e522..93fea16e99 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergePanel.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergePanel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -79,6 +78,7 @@ class PropertyListMergePanel extends JPanel {private ConflictPanel createConflictPanel() {ChangeListener changeListener = new ChangeListener() {+ @Overridepublic void stateChanged(ChangeEvent e) {mergeManager.clearStatusText();mergeManager.setApplyEnabled(true);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/algorithmtree/ModuleAlgorithmPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/algorithmtree/ModuleAlgorithmPlugin.javaindex 341fdf8461..1de5db3cb6 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/algorithmtree/ModuleAlgorithmPlugin.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/algorithmtree/ModuleAlgorithmPlugin.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.@@ -187,6 +187,7 @@ public class ModuleAlgorithmPlugin extends ProgramPlugin implements BlockModelSe/*** @see ghidra.app.services.BlockModelServiceListener#modelAdded(java.lang.String, int)*/+ @Overridepublic void modelAdded(String modeName, int modelType) {if (modelType == BlockModelService.SUBROUTINE_MODEL) {updateSubroutineActions();@@ -196,6 +197,7 @@ public class ModuleAlgorithmPlugin extends ProgramPlugin implements BlockModelSe/*** @see ghidra.app.services.BlockModelServiceListener#modelRemoved(java.lang.String, int)*/+ @Overridepublic void modelRemoved(String modeName, int modelType) {if (modelType == BlockModelService.SUBROUTINE_MODEL) {updateSubroutineActions();diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisTaskList.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisTaskList.javaindex 56516ad465..f4cade2c04 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisTaskList.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisTaskList.java@@ -34,6 +34,7 @@ public class AnalysisTaskList {private static Comparator<AnalysisScheduler> priorityComparator =new Comparator<AnalysisScheduler>() {+ @Overridepublic int compare(AnalysisScheduler as1, AnalysisScheduler as2) {Analyzer a1 = as1.getAnalyzer();Analyzer a2 = as2.getAnalyzer();diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.javaindex 59e90d3a98..34619deed2 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java@@ -449,6 +449,7 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer {* @return - set of addresses actually flowed to* @throws CancelledException*/+ @Overridepublic AddressSetView analyzeLocation(final Program program, Address start, AddressSetView set,final TaskMonitor monitor) throws CancelledException {diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ObjectiveC2_MessageAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ObjectiveC2_MessageAnalyzer.javaindex bfbc6d9060..80daa09044 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ObjectiveC2_MessageAnalyzer.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ObjectiveC2_MessageAnalyzer.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.@@ -44,6 +44,7 @@ public class ObjectiveC2_MessageAnalyzer extends AbstractAnalyzer {setPriority(AnalysisPriority.FORMAT_ANALYSIS.after());}+ @Overridepublic boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log)throws CancelledException {AddressIterator iterator = set.getAddresses(true);@@ -63,6 +64,7 @@ public class ObjectiveC2_MessageAnalyzer extends AbstractAnalyzer {return true;}+ @Overridepublic boolean canAnalyze(Program program) {return ObjectiveC2_Constants.isObjectiveC2(program);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/UpdateAlignmentAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/UpdateAlignmentAction.javaindex c15dcdb7f9..8900d2d78b 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/UpdateAlignmentAction.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/UpdateAlignmentAction.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -56,10 +55,12 @@ public class UpdateAlignmentAction extends ToggleDockingAction implements Addres}}+ @Overridepublic void alignmentChanged() {setSelected(model.getAlignment() == alignment);}+ @Overridepublic void alignmentPermissionChanged() {setSelected(model.getAlignment() == alignment);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/validator/PostAnalysisValidator.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/validator/PostAnalysisValidator.javaindex 87d9e4c61b..aa92865bbd 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/validator/PostAnalysisValidator.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/validator/PostAnalysisValidator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -33,6 +32,7 @@ public abstract class PostAnalysisValidator implements ConditionTester, Extensioreturn program;}+ @Overridepublic final ConditionResult run(TaskMonitor monitor) throws CancelledException {if (!program.addConsumer(this)) {diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/console/CodeCompletion.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/console/CodeCompletion.javaindex 7c83260bbf..725e8f307a 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/console/CodeCompletion.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/console/CodeCompletion.java@@ -134,6 +134,7 @@ public class CodeCompletion implements Comparable<CodeCompletion> {return "CodeCompletion: '" + getDescription() + "' (" + getInsertion() + ")";}+ @Overridepublic int compareTo(CodeCompletion that) {return this.description.compareToIgnoreCase(that.description);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataSettingsDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataSettingsDialog.javaindex 73cc281286..f07ef4e1a6 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataSettingsDialog.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataSettingsDialog.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.@@ -356,6 +356,7 @@ public class DataSettingsDialog extends AbstractSettingsDialog {return settingsDefinition.getSuggestedValues(sampleSelectionSettings);}+ @Overrideprotected void applySettings() throws CancelledException {int txId = program.startTransaction(getTitle());try {diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/RenameDataFieldDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/RenameDataFieldDialog.javaindex 54f62ba36b..27283c0b2b 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/RenameDataFieldDialog.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/RenameDataFieldDialog.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.@@ -89,6 +89,7 @@ class RenameDataFieldDialog extends DialogComponentProvider {setFocusComponent(recentChoices);recentChoices.addActionListener(new ActionListener() {+ @Overridepublic void actionPerformed(ActionEvent e) {okCallback();}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CopyAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CopyAction.javaindex 9423d52050..d04959c781 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CopyAction.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CopyAction.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -115,6 +114,7 @@ public class CopyAction extends DockingAction {Transferable contents = new GTreeNodeTransferable(dragNDropHandler, list);clipboard.setContents(contents, new ClipboardOwner() {+ @Overridepublic void lostOwnership(Clipboard currentClipboard, Transferable transferable) {// we don't care}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/CenterVerticalIcon.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/CenterVerticalIcon.javaindex 28fb5435d7..71236bbec7 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/CenterVerticalIcon.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/CenterVerticalIcon.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -32,14 +31,17 @@ public class CenterVerticalIcon implements Icon {verticalOffset = (height - icon.getIconHeight()) / 2;}+ @Overridepublic int getIconHeight() {return height;}+ @Overridepublic int getIconWidth() {return icon.getIconWidth();}+ @Overridepublic void paintIcon(Component c, Graphics g, int x, int y) {icon.paintIcon(c, g, x, y + verticalOffset);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/util/DataDropOnBrowserHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/util/DataDropOnBrowserHandler.javaindex c9409551fe..2fb377a75d 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/util/DataDropOnBrowserHandler.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/util/DataDropOnBrowserHandler.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.@@ -42,10 +42,12 @@ public class DataDropOnBrowserHandler implements ProgramDropProvider {this.plugin = plugin;}+ @Overridepublic int getPriority() {return 20;}+ @Overridepublic DataFlavor[] getDataFlavors() {return ACCEPTABLE_FLAVORS;}@@ -53,6 +55,7 @@ public class DataDropOnBrowserHandler implements ProgramDropProvider {/*** @see ghidra.app.util.ProgramDropProvider#isDropOk(java.lang.Object, java.awt.dnd.DropTargetDragEvent)*/+ @Overridepublic boolean isDropOk(Object contextObj, DropTargetDragEvent evt) {curService = null;@@ -74,6 +77,7 @@ public class DataDropOnBrowserHandler implements ProgramDropProvider {return false;}+ @Overridepublic void add(Object contextObj, Object data, DataFlavor flavor) {if (curService != null) {DataType dt = (DataType)data;diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datapreview/DataTypeComponentPreview.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datapreview/DataTypeComponentPreview.javaindex 3bcedcdcf3..8961e1b612 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datapreview/DataTypeComponentPreview.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datapreview/DataTypeComponentPreview.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.@@ -51,7 +51,8 @@ class DataTypeComponentPreview implements Preview {this.parentPreview = parent;}- public String getName() {+ @Override+ public String getName() {String fieldName = dtc.getFieldName();if (fieldName == null) {fieldName = dtc.getDefaultFieldName();@@ -62,7 +63,8 @@ class DataTypeComponentPreview implements Preview {return parentPreview.getName()+"."+fieldName;}- public String getPreview(Memory memory, Address addr) {+ @Override+ public String getPreview(Memory memory, Address addr) {try {if (parentPreview != null) {addr = addr.add(parentPreview.dtc.getOffset());@@ -77,6 +79,7 @@ class DataTypeComponentPreview implements Preview {}}+ @Overridepublic DataType getDataType() {if (parentPreview != null) {return parentPreview.getDataType();@@ -89,7 +92,8 @@ class DataTypeComponentPreview implements Preview {return getName();}- public int compareTo(Preview p) {+ @Override+ public int compareTo(Preview p) {if (p instanceof DataTypeComponentPreview) {DataTypeComponentPreview that = (DataTypeComponentPreview)p;diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/fallthrough/FallThroughModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/fallthrough/FallThroughModel.javaindex c0ec32641b..43e5022fd4 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/fallthrough/FallThroughModel.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/fallthrough/FallThroughModel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -256,6 +255,7 @@ class FallThroughModel implements ChangeListener {}}+ @Overridepublic void stateChanged(ChangeEvent e) {// do nothing - just a placeholder so that we don't have to check for null listener}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/ExternalEntryFunctionAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/ExternalEntryFunctionAnalyzer.javaindex 27cf96a020..fde198cad5 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/ExternalEntryFunctionAnalyzer.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/ExternalEntryFunctionAnalyzer.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.@@ -38,6 +38,7 @@ public class ExternalEntryFunctionAnalyzer extends AbstractAnalyzer {* Called when a function has been added.* Looks at address for call reference*/+ @Overridepublic boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log) {AddressSet funcStarts = new AddressSet();diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/GroupTransferable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/GroupTransferable.javaindex 14cfb45ce2..b31b12becc 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/GroupTransferable.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/GroupTransferable.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -68,21 +67,24 @@ public class GroupTransferable implements Transferable {/*** Return all data flavors that this class supports.*/- public synchronized DataFlavor []getTransferDataFlavors() {+ @Override+ public synchronized DataFlavor []getTransferDataFlavors() {return flavors;}/*** Return whether the specified data flavor is supported.*/- public boolean isDataFlavorSupported(DataFlavor f) {+ @Override+ public boolean isDataFlavorSupported(DataFlavor f) {return flavorList.contains(f);}/*** Return the transfer data with the given data flavor.*/- public synchronized Object getTransferData(DataFlavor f)+ @Override+ public synchronized Object getTransferData(DataFlavor f)throws UnsupportedFlavorException, IOException {if (f.equals(localGroupFlavor)) {diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditReferencePanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditReferencePanel.javaindex 7861d42086..3179771ff2 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditReferencePanel.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditReferencePanel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -91,6 +90,7 @@ abstract class EditReferencePanel extends JPanel {@Overridepublic void requestFocus() {SwingUtilities.invokeLater(new Runnable() {+ @Overridepublic void run() {KeyboardFocusManager kfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();kfm.focusNextComponent(EditReferencePanel.this);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/stackeditor/StackEditorManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/stackeditor/StackEditorManagerPlugin.javaindex e45b7ca005..641c4db99b 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/stackeditor/StackEditorManagerPlugin.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/stackeditor/StackEditorManagerPlugin.java@@ -128,6 +128,7 @@ public class StackEditorManagerPlugin extends Pluginreturn editorMgr.canCloseDomainObject(dObj);}+ @Overridepublic void optionsChanged(ToolOptions options, String optionName, Object oldValue,Object newValue) {setOptions(options);@@ -155,6 +156,7 @@ public class StackEditorManagerPlugin extends Pluginoptions.setBoolean(HEX_NUMBERS_OPTION_NAME, showNumbersInHex);}+ @Overridepublic boolean showStackNumbersInHex() {return showNumbersInHex;}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/propertymanager/PropertyManagerTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/propertymanager/PropertyManagerTableModel.javaindex 1ca2627918..96210ade3a 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/propertymanager/PropertyManagerTableModel.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/propertymanager/PropertyManagerTableModel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -70,6 +69,7 @@ class PropertyManagerTableModel extends AbstractTableModel {/** @see javax.swing.table.TableModel#getColumnCount()*/+ @Overridepublic int getColumnCount() {return 1;}@@ -77,6 +77,7 @@ class PropertyManagerTableModel extends AbstractTableModel {/** @see javax.swing.table.TableModel#getRowCount()*/+ @Overridepublic synchronized int getRowCount() {if (propertyNames != null) {return propertyNames.length;@@ -95,6 +96,7 @@ class PropertyManagerTableModel extends AbstractTableModel {/** @see javax.swing.table.TableModel#getValueAt(int, int)*/+ @Overridepublic synchronized Object getValueAt(int rowIndex, int columnIndex) {if (propertyNames != null && rowIndex < propertyNames.length) {return propertyNames[rowIndex];diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/Match.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/Match.javaindex 0e1be75031..380a0e4638 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/Match.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/Match.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.@@ -226,6 +226,7 @@ public class Match implements Comparable<Match>/* (non-Javadoc)* @see java.lang.Comparable#compareTo(java.lang.Object)*/+ @Overridepublic int compareTo(Match m) {int val = getThisBeginning().compareTo( m.getThisBeginning() );if( val != 0 )diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/AnalyzerAdapter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/AnalyzerAdapter.javaindex 92816334b9..eb96593778 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/AnalyzerAdapter.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/AnalyzerAdapter.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -29,11 +28,13 @@ public abstract class AnalyzerAdapter extends AbstractAnalyzer {setPriority(priority);}+ @Overridepublic boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log)throws CancelledException {return false;}+ @Overridepublic boolean getDefaultEnablement(Program program) {return false;}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/CodeUnitInfoTransferable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/CodeUnitInfoTransferable.javaindex 3113ee1e02..afc19f627b 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/CodeUnitInfoTransferable.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/CodeUnitInfoTransferable.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -66,6 +65,7 @@ public class CodeUnitInfoTransferable implements Transferable, ClipboardOwner {/*** Return all data flavors that this class supports.*/+ @Overridepublic synchronized DataFlavor[] getTransferDataFlavors() {return flavors;}@@ -73,6 +73,7 @@ public class CodeUnitInfoTransferable implements Transferable, ClipboardOwner {/*** Return whether the specified data flavor is supported.*/+ @Overridepublic boolean isDataFlavorSupported(DataFlavor f) {return flavorList.contains(f);}@@ -80,6 +81,7 @@ public class CodeUnitInfoTransferable implements Transferable, ClipboardOwner {/*** Return the transfer data with the given data flavor.*/+ @Overridepublic synchronized Object getTransferData(DataFlavor f) throws UnsupportedFlavorException,IOException {@@ -101,6 +103,7 @@ public class CodeUnitInfoTransferable implements Transferable, ClipboardOwner {* (non-Javadoc)* @see java.awt.datatransfer.ClipboardOwner#lostOwnership(java.awt.datatransfer.Clipboard, java.awt.datatransfer.Transferable)*/+ @Overridepublic void lostOwnership(Clipboard clipboard, Transferable contents) {}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/AoutHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/AoutHeader.javaindex 5f1c22bc90..b99304d776 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/AoutHeader.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/AoutHeader.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -77,6 +76,7 @@ public class AoutHeader implements StructConverter {return data_start;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(AoutHeader.class);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffLineNumber.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffLineNumber.javaindex 9f5d36e3de..8b0cbf92a5 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffLineNumber.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffLineNumber.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -45,6 +44,7 @@ public class CoffLineNumber implements StructConverter {return l_lnno;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(CoffLineNumber.class);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffRelocation.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffRelocation.javaindex 4971b636a2..db9bb3fcaf 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffRelocation.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffRelocation.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.@@ -89,6 +89,7 @@ public class CoffRelocation implements StructConverter {return r_type;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType(StructConverterUtil.parseName(CoffRelocation.class), 0);struct.add(DWORD, "r_vaddr", null);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxArray.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxArray.javaindex af12322318..5e5ef8c348 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxArray.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -77,6 +76,7 @@ public class CoffSymbolAuxArray implements CoffSymbolAux {return unused;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxBeginningOfBlock.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxBeginningOfBlock.javaindex 0e5508687f..a3862d1c12 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxBeginningOfBlock.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxBeginningOfBlock.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.@@ -58,6 +58,7 @@ public class CoffSymbolAuxBeginningOfBlock implements CoffSymbolAux {return unused3;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxDefault.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxDefault.javaindex f15761f234..30586684a7 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxDefault.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxDefault.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -35,6 +34,7 @@ class CoffSymbolAuxDefault implements CoffSymbolAux {return bytes;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxEndOfBlock.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxEndOfBlock.javaindex 9d33401651..f04a51e5e9 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxEndOfBlock.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxEndOfBlock.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -47,6 +46,7 @@ public class CoffSymbolAuxEndOfBlock implements CoffSymbolAux {return unused2;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxEndOfStruct.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxEndOfStruct.javaindex db00e61ca5..a4eba72fe6 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxEndOfStruct.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxEndOfStruct.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -53,6 +52,7 @@ public class CoffSymbolAuxEndOfStruct implements CoffSymbolAux {return unused2;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxFilename.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxFilename.javaindex f9979f11bd..1310200e50 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxFilename.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxFilename.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -41,6 +40,7 @@ public class CoffSymbolAuxFilename implements CoffSymbolAux {return unused;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxFunction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxFunction.javaindex 31c3dda098..6083423d80 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxFunction.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxFunction.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -59,6 +58,7 @@ public class CoffSymbolAuxFunction implements CoffSymbolAux {return unused;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxName.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxName.javaindex 9dbe2b928b..a4cc2d832a 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxName.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxName.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -53,6 +52,7 @@ public class CoffSymbolAuxName implements CoffSymbolAux {return unused2;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxSection.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxSection.javaindex 441b381a3e..67bd7ab934 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxSection.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxSection.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -53,6 +52,7 @@ public class CoffSymbolAuxSection implements CoffSymbolAux {return unused;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxTagName.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxTagName.javaindex f9bac67a3e..985f3340f7 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxTagName.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSymbolAuxTagName.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -59,6 +58,7 @@ public class CoffSymbolAuxTagName implements CoffSymbolAux {return unused3;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/SecondLinkerMember.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/SecondLinkerMember.javaindex 1ad17997e3..fd559e01ae 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/SecondLinkerMember.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/SecondLinkerMember.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.@@ -112,6 +112,7 @@ public final class SecondLinkerMember implements StructConverter {return new ArrayList<String>(stringTable);}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {String name = StructConverterUtil.parseName(SecondLinkerMember.class);String uniqueName = name + "_" + numberOfMembers + "_" + numberOfSymbols;diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/expression/DWARFExpressionException.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/expression/DWARFExpressionException.javaindex ada4392161..387c705820 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/expression/DWARFExpressionException.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/expression/DWARFExpressionException.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.@@ -70,6 +70,7 @@ public class DWARFExpressionException extends Exception {return step;}+ @Overridepublic String getMessage() {return super.getMessage() + (expr != null ? "\n" + expr.toString(step, false, false) : "");}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerdaux.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerdaux.javaindex c05d7d58ef..a80114a6a0 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerdaux.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerdaux.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -58,7 +57,8 @@ public class GnuVerdaux implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/- public DataType toDataType() throws DuplicateNameException, IOException {+ @Override+ public DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType("Elf_Verdaux", 0);struct.add(DWORD, "vna_name", "Version or dependency names");struct.add(DWORD, "vna_next", "Offset in bytes to next verdaux entry");diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerdef.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerdef.javaindex 97a21a1454..d51029290c 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerdef.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerdef.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -93,7 +92,8 @@ public class GnuVerdef implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/- public DataType toDataType() throws DuplicateNameException, IOException {+ @Override+ public DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType("Elf_Verdef", 0);struct.add( WORD, "vd_version", "Version revision");struct.add( WORD, "vd_flags", "Version information");diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVernaux.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVernaux.javaindex a7bb25d0e4..feebdf4d81 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVernaux.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVernaux.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -79,7 +78,8 @@ public class GnuVernaux implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/- public DataType toDataType() throws DuplicateNameException, IOException {+ @Override+ public DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType("Elf_Verdef", 0);struct.add(DWORD, "vna_hash", "Hash value of dependency name");struct.add( WORD, "vna_flags", "Dependency specific information");diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerneed.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerneed.javaindex ade364d024..07a3afdef3 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerneed.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuVerneed.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -79,7 +78,8 @@ public class GnuVerneed implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/- public DataType toDataType() throws DuplicateNameException, IOException {+ @Override+ public DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType("Elf_Verneed", 0);struct.add( WORD, "vd_version", "Version of structure");struct.add( WORD, "vd_cnt", "Number of associated aux entries");diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/types/GoMethod.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/types/GoMethod.javaindex 9413ca1cf2..f7ce371f3c 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/types/GoMethod.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/types/GoMethod.java@@ -199,6 +199,7 @@ public class GoMethod implements StructureMarkup<GoMethod> {return funcAddr.equals(method.getTfn());}+ @Overridepublic String toString() {return type.getMethodPrototypeString(method.getName(), getMethodFuncType());}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/asd/AppleSingleDouble.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/asd/AppleSingleDouble.javaindex 18a1651c62..9af2d2ed05 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/asd/AppleSingleDouble.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/asd/AppleSingleDouble.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -74,6 +73,7 @@ public class AppleSingleDouble implements StructConverter {return entryList;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {String name = StructConverterUtil.parseName(AppleSingleDouble.class);Structure struct = new StructureDataType(name, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/asd/EntryDescriptor.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/asd/EntryDescriptor.javaindex 3db8e35683..1690c64935 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/asd/EntryDescriptor.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/asd/EntryDescriptor.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.@@ -73,6 +73,7 @@ public class EntryDescriptor implements StructConverter {return _entry;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(EntryDescriptor.class);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragResource.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragResource.javaindex d84d7f9aeb..ed3a81cb66 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragResource.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragResource.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -75,6 +74,7 @@ public class CFragResource implements StructConverter {return _members;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(CFragResource.class);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragResourceMember.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragResourceMember.javaindex 6dbf9aa41f..4d51ab3ecf 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragResourceMember.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragResourceMember.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -131,6 +130,7 @@ public class CFragResourceMember implements StructConverter {return name;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {String structName = StructConverterUtil.parseName(CFragResourceMember.class);Structure struct = new StructureDataType(structName, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragUsage1Union.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragUsage1Union.javaindex f60e09bf1d..0c04361a6d 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragUsage1Union.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragUsage1Union.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -40,6 +39,7 @@ public class CFragUsage1Union implements StructConverter {return appStackSize;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(getClass());}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragUsage2Union.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragUsage2Union.javaindex 97002d53a8..575c35407d 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragUsage2Union.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragUsage2Union.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.@@ -34,6 +34,7 @@ public class CFragUsage2Union implements StructConverter {return appSubdirID;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(getClass());}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragWhere1Union.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragWhere1Union.javaindex 01885d134e..446a7382d2 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragWhere1Union.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragWhere1Union.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.@@ -32,6 +32,7 @@ public class CFragWhere1Union implements StructConverter {return spaceID;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(getClass());}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragWhere2Union.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragWhere2Union.javaindex 5edd72f6b5..980e39bab5 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragWhere2Union.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/cfm/CFragWhere2Union.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.@@ -33,6 +33,7 @@ public class CFragWhere2Union implements StructConverter {return reserved;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(getClass());}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ReferenceListEntry.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ReferenceListEntry.javaindex 5572db5a0b..25285647b9 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ReferenceListEntry.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ReferenceListEntry.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -98,6 +97,7 @@ public class ReferenceListEntry implements StructConverter {return handle;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {String name = StructConverterUtil.parseName(ReferenceListEntry.class);Structure struct = new StructureDataType(name, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ResourceHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ResourceHeader.javaindex 329a6ce019..80630c56b5 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ResourceHeader.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ResourceHeader.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -102,6 +101,7 @@ public class ResourceHeader extends Entry implements StructConverter {return _map;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(ResourceHeader.class);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ResourceType.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ResourceType.javaindex 4d942bdfa7..6bb48d2ddf 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ResourceType.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macos/rm/ResourceType.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -100,6 +99,7 @@ public class ResourceType implements StructConverter {return _referenceList;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {String name = StructConverterUtil.parseName(ResourceType.class);Structure struct = new StructureDataType(name, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Cache.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Cache.javaindex 6b562b9173..f35f63fe13 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Cache.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Cache.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -44,6 +43,7 @@ public class ObjectiveC2_Cache implements StructConverter {return cache;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {if (_state.is32bit) {return new TypedefDataType("Cache", DWORD);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Category.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Category.javaindex f7dc4877cb..bc90883ffd 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Category.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Category.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.@@ -143,6 +143,7 @@ public class ObjectiveC2_Category implements StructConverter {}}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StringBuffer buffer = new StringBuffer();buffer.append(NAME);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Class.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Class.javaindex f51ef59801..f4a8505416 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Class.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Class.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.@@ -191,6 +191,7 @@ public class ObjectiveC2_Class implements StructConverter {}}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ClassRW.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ClassRW.javaindex 2c2c4d48fb..b65bba65b8 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ClassRW.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ClassRW.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -161,6 +160,7 @@ public class ObjectiveC2_ClassRW implements StructConverter {}}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ImageInfo.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ImageInfo.javaindex 4d2b41d570..9b34f0d90a 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ImageInfo.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ImageInfo.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -68,6 +67,7 @@ public class ObjectiveC2_ImageInfo implements StructConverter {return _index;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType("objc_image_info", 0);struct.add(DWORD, "version", null);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Implementation.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Implementation.javaindex 5f487d9005..a390618938 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Implementation.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Implementation.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.@@ -63,6 +63,7 @@ public class ObjectiveC2_Implementation implements StructConverter {return _index;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {if (_isSmall) {return new TypedefDataType("ImplementationOffset", DWORD);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_InstanceVariable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_InstanceVariable.javaindex e64d819817..7c315ca9e5 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_InstanceVariable.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_InstanceVariable.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -80,6 +79,7 @@ public class ObjectiveC2_InstanceVariable implements StructConverter {return size;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType("ivar_t", 0);if (_state.is32bit) {diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_InstanceVariableList.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_InstanceVariableList.javaindex 6c674377fa..76797560bd 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_InstanceVariableList.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_InstanceVariableList.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.@@ -74,6 +74,7 @@ public class ObjectiveC2_InstanceVariableList implements StructConverter {return struct;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType(NAME+'_'+count+'_', 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_MessageReference.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_MessageReference.javaindex 2c6e16a3d6..ab26fc56d1 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_MessageReference.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_MessageReference.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -61,6 +60,7 @@ public class ObjectiveC2_MessageReference implements StructConverter {return selector;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType(NAME, 0);struct.add(new PointerDataType(VOID), _state.pointerSize, "imp", null);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Property.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Property.javaindex 5fd786d334..48c7475a74 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Property.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Property.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -49,6 +48,7 @@ public class ObjectiveC2_Property implements StructConverter {return attributes;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType("objc_property", 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_PropertyList.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_PropertyList.javaindex b7940bdae9..99252e67c7 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_PropertyList.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_PropertyList.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.@@ -75,6 +75,7 @@ public class ObjectiveC2_PropertyList implements StructConverter {return struct;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType(NAME+'_'+count+'_', 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Protocol.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Protocol.javaindex bd23e9edbf..b84798cdef 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Protocol.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Protocol.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.@@ -181,6 +181,7 @@ public class ObjectiveC2_Protocol implements StructConverter {}}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ProtocolList.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ProtocolList.javaindex c29dcef40a..913285e6c7 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ProtocolList.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_ProtocolList.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.@@ -77,6 +77,7 @@ public class ObjectiveC2_ProtocolList implements StructConverter {return struct;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType(NAME+'_'+protocols.size()+'_', 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Category.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Category.javaindex 203ea6c8d4..a61c122aae 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Category.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Category.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -82,6 +81,7 @@ public class ObjectiveC1_Category implements StructConverter {return unknown1;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {String name = "objc_category";StructureDataType struct = new StructureDataType(name, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Class.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Class.javaindex ff62d28e6f..f270646ffd 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Class.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Class.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.@@ -114,6 +114,7 @@ public class ObjectiveC1_Class implements StructConverter {return unknown1;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType(NAME, 0);struct.setCategoryPath(ObjectiveC1_Constants.CATEGORY_PATH);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_InstanceVariable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_InstanceVariable.javaindex b36c955c73..db6cf0e639 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_InstanceVariable.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_InstanceVariable.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -53,6 +52,7 @@ public class ObjectiveC1_InstanceVariable implements StructConverter {return offset;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType("objc_ivar", 0);struct.setCategoryPath(ObjectiveC1_Constants.CATEGORY_PATH);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_InstanceVariableList.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_InstanceVariableList.javaindex 84cb0d9dbe..1be33a708c 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_InstanceVariableList.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_InstanceVariableList.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.@@ -63,6 +63,7 @@ public class ObjectiveC1_InstanceVariableList implements StructConverter {return struct;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType("objc_ivar_list"+"_"+ivar_count+"_", 0);struct.setCategoryPath(ObjectiveC1_Constants.CATEGORY_PATH);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_MetaClass.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_MetaClass.javaindex 86438408b7..517aa109a1 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_MetaClass.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_MetaClass.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -97,6 +96,7 @@ public class ObjectiveC1_MetaClass implements StructConverter {return unknown1;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {String name = "objc_metaclass";StructureDataType struct = new StructureDataType(name, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Method.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Method.javaindex 0e96c63da3..ba77697b8a 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Method.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Method.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -49,6 +48,7 @@ public class ObjectiveC1_Method extends ObjectiveC_Method {return address & Conv.INT_MASK;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType("objc_method", 0);struct.setCategoryPath(ObjectiveC1_Constants.CATEGORY_PATH);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_MethodList.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_MethodList.javaindex b922bb1629..511dccf806 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_MethodList.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_MethodList.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.@@ -60,6 +60,7 @@ public class ObjectiveC1_MethodList extends ObjectiveC_MethodList {return struct;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType(NAME+"_"+method_count+"_", 0);struct.setCategoryPath(ObjectiveC1_Constants.CATEGORY_PATH);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Protocol.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Protocol.javaindex 62b2d592d1..57633438fd 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Protocol.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Protocol.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -70,6 +69,7 @@ public class ObjectiveC1_Protocol implements StructConverter {return classMethods;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType(NAME, 0);struct.setCategoryPath(ObjectiveC1_Constants.CATEGORY_PATH);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolList.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolList.javaindex 4fdd6d251c..e0fc19abb8 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolList.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolList.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.@@ -76,6 +76,7 @@ public class ObjectiveC1_ProtocolList implements StructConverter {return struct;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType(NAME+"_"+count+"_", 0);struct.setCategoryPath(ObjectiveC1_Constants.CATEGORY_PATH);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolMethod.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolMethod.javaindex 0469db492f..48f0a583b2 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolMethod.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolMethod.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -54,6 +53,7 @@ public class ObjectiveC1_ProtocolMethod implements StructConverter {return _methodType;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType(NAME, 0);struct.setCategoryPath(ObjectiveC1_Constants.CATEGORY_PATH);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolMethodList.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolMethodList.javaindex a3038af8c0..8fc8454999 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolMethodList.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_ProtocolMethodList.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.@@ -64,6 +64,7 @@ public class ObjectiveC1_ProtocolMethodList implements StructConverter {return struct;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType(NAME+"_"+method_count+"_", 0);struct.setCategoryPath(ObjectiveC1_Constants.CATEGORY_PATH);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCodeViewSymbolTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCodeViewSymbolTable.javaindex 47bbc173e9..e81cd7c802 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCodeViewSymbolTable.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCodeViewSymbolTable.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.@@ -182,7 +182,8 @@ public class DebugCodeViewSymbolTable implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/- public DataType toDataType() throws DuplicateNameException {+ @Override+ public DataType toDataType() throws DuplicateNameException {return null;}}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugMisc.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugMisc.javaindex 46d608bbe4..aea4bf97b5 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugMisc.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugMisc.java@@ -162,6 +162,7 @@ public class DebugMisc implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceDataEntry.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceDataEntry.javaindex 5d08dc844a..1a13b76c4e 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceDataEntry.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceDataEntry.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.@@ -80,6 +80,7 @@ public class ResourceDataEntry implements StructConverter {return reserved;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType(NAME, 0);struct.add(DWORD, "OffsetToData", null);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceDirectory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceDirectory.javaindex 9987f52453..f608a4afa2 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceDirectory.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceDirectory.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.@@ -154,6 +154,7 @@ public class ResourceDirectory implements StructConverter {return minorVersion;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = new StructureDataType(NAME, 0);struct.add(DWORD, "Characteristics", null);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceInfo.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceInfo.javaindex efe1568b10..d8c72cc8b8 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceInfo.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/ResourceInfo.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.@@ -93,7 +93,8 @@ public class ResourceInfo implements Comparable<ResourceInfo> {return name+" - 0x"+Integer.toHexString(address);}- public int compareTo(ResourceInfo that) {+ @Override+ public int compareTo(ResourceInfo that) {return this.typeID - that.typeID;}}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ContainerHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ContainerHeader.javaindex cc9891542c..511fab80d8 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ContainerHeader.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ContainerHeader.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.@@ -197,6 +197,7 @@ public class ContainerHeader implements StructConverter {return _loader;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType("ContainerHeader", 0);struct.add(STRING, 4, "tag1", null);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbol.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbol.javaindex a593ad266d..2b7e8321e6 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbol.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbol.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.@@ -89,6 +89,7 @@ public class ExportedSymbol extends AbstractSymbol {return sectionIndex;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(getClass());}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbolHashSlot.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbolHashSlot.javaindex f6bc54f7a9..8be8601c85 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbolHashSlot.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbolHashSlot.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.@@ -50,6 +50,7 @@ public class ExportedSymbolHashSlot implements StructConverter {return indexOfFirstExportKey;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return new TypedefDataType("ExportedSymbolHashSlot", DWORD);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbolKey.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbolKey.javaindex 056622eeb9..7def5b4b05 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbolKey.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ExportedSymbolKey.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.@@ -64,6 +64,7 @@ public class ExportedSymbolKey implements StructConverter {return hashValue;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return new TypedefDataType("ExportedSymbolKey", DWORD);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportedLibrary.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportedLibrary.javaindex 3b2e00db92..61300b0926 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportedLibrary.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportedLibrary.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.@@ -161,6 +161,7 @@ public class ImportedLibrary implements StructConverter {return _name;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(getClass());}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportedSymbol.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportedSymbol.javaindex be35f613a7..11ea322c00 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportedSymbol.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportedSymbol.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.@@ -67,6 +67,7 @@ public class ImportedSymbol extends AbstractSymbol {return symbolNameOffset;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return new TypedefDataType("ImportedSymbol", DWORD);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/LoaderInfoHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/LoaderInfoHeader.javaindex f2553cd343..adcde9d803 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/LoaderInfoHeader.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/LoaderInfoHeader.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.@@ -290,6 +290,7 @@ public class LoaderInfoHeader implements StructConverter {return _exportedSymbols;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(getClass());}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/PefDebug.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/PefDebug.javaindex 0e29f36d14..bbc9816680 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/PefDebug.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/PefDebug.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -84,6 +83,7 @@ public class PefDebug implements StructConverter {return true;}+ @Overridepublic DataType toDataType() throws DuplicateNameException {String structureName = "PEF_Debug_0x"+Integer.toHexString(nameLength);StructureDataType structure = new StructureDataType(structureName, 0);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/Relocation.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/Relocation.javaindex 1e8924c69b..84d8552972 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/Relocation.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/Relocation.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.@@ -70,6 +70,7 @@ public abstract class Relocation implements StructConverter {return 0;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {DataType dt = getSizeInBytes() == 2 ? WORD : DWORD;return new TypedefDataType(toString(), dt);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffFileHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffFileHeader.javaindex 35105c1037..43a8306440 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffFileHeader.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffFileHeader.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -123,6 +122,7 @@ public class XCoffFileHeader implements StructConverter {return buffer.toString();}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(XCoffFileHeader.class);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffOptionalHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffOptionalHeader.javaindex c505a226f1..35b3d60cd8 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffOptionalHeader.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffOptionalHeader.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.@@ -324,6 +324,7 @@ public final class XCoffOptionalHeader implements StructConverter {return o_sntbss;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(XCoffOptionalHeader.class);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffSectionHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffSectionHeader.javaindex 84fef5b7e9..f9552118bd 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffSectionHeader.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffSectionHeader.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -73,6 +72,7 @@ public final class XCoffSectionHeader implements StructConverter {return _sizeof;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(XCoffSectionHeader.class);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/GzfExporter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/GzfExporter.javaindex e8b185bdcd..7ed69e1672 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/GzfExporter.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/GzfExporter.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.@@ -45,6 +45,7 @@ public class GzfExporter extends Exporter {return canExportDomainObject(domainFile.getDomainObjectClass());}+ @Overridepublic boolean canExportDomainObject(Class<? extends DomainObject> domainObjectClass) {return ProgramDB.class.isAssignableFrom(domainObjectClass);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/BoundedBufferedReader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/BoundedBufferedReader.javaindex 8b313a929a..9c1732f0be 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/BoundedBufferedReader.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/BoundedBufferedReader.java@@ -130,6 +130,7 @@ public class BoundedBufferedReader extends Reader {* @exception IOException* If an I/O error occurs*/+ @Overridepublic int read() throws IOException {synchronized (lock) {ensureOpen();@@ -239,6 +240,7 @@ public class BoundedBufferedReader extends Reader {* @exception IOException* If an I/O error occurs*/+ @Overridepublic int read(char cbuf[], int off, int len) throws IOException {synchronized (lock) {ensureOpen();@@ -373,6 +375,7 @@ public class BoundedBufferedReader extends Reader {* @exception IOException* If an I/O error occurs*/+ @Overridepublic long skip(long n) throws IOException {if (n < 0L) {throw new IllegalArgumentException("skip value is negative");@@ -412,6 +415,7 @@ public class BoundedBufferedReader extends Reader {* @exception IOException* If an I/O error occurs*/+ @Overridepublic boolean ready() throws IOException {synchronized (lock) {ensureOpen();@@ -441,6 +445,7 @@ public class BoundedBufferedReader extends Reader {/*** Tells whether this stream supports the mark() operation, which it does.*/+ @Overridepublic boolean markSupported() {return true;}@@ -462,6 +467,7 @@ public class BoundedBufferedReader extends Reader {* @exception IOException* If an I/O error occurs*/+ @Overridepublic void mark(int readAheadLimit) throws IOException {if (readAheadLimit < 0) {throw new IllegalArgumentException("Read-ahead limit < 0");@@ -481,6 +487,7 @@ public class BoundedBufferedReader extends Reader {* If the stream has never been marked, or if the mark has* been invalidated*/+ @Overridepublic void reset() throws IOException {synchronized (lock) {ensureOpen();@@ -493,6 +500,7 @@ public class BoundedBufferedReader extends Reader {}}+ @Overridepublic void close() throws IOException {synchronized (lock) {if (in == null)diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/recognizer/RecognizerService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/recognizer/RecognizerService.javaindex eb44e338bd..93937ae850 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/recognizer/RecognizerService.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/recognizer/RecognizerService.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -22,6 +21,7 @@ import java.util.*;public class RecognizerService {private static final Comparator<Recognizer> DESCENDING = new Comparator<Recognizer>() {+ @Overridepublic int compare(Recognizer o1, Recognizer o2) {return o2.getPriority() - o1.getPriority();}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/OpenCloseFieldMouseHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/OpenCloseFieldMouseHandler.javaindex 29d9bea07d..4cc0329431 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/OpenCloseFieldMouseHandler.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/OpenCloseFieldMouseHandler.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -25,6 +24,7 @@ import java.awt.event.MouseEvent;public class OpenCloseFieldMouseHandler implements FieldMouseHandlerExtension {private final static Class<?>[] SUPPORTED_CLASSES = new Class[] { OpenCloseField.class };+ @Overridepublic boolean fieldElementClicked(Object clickedObject, Navigatable sourceNavigatable,ProgramLocation location, MouseEvent mouseEvent, ServiceProvider serviceProvider) {diff --git a/Ghidra/Features/Base/src/main/java/ghidra/framework/data/GhidraToolState.java b/Ghidra/Features/Base/src/main/java/ghidra/framework/data/GhidraToolState.javaindex 1266775114..e949a70179 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/framework/data/GhidraToolState.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/framework/data/GhidraToolState.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -40,7 +39,8 @@ public class GhidraToolState extends ToolState implements NavigatableRemovalList}}- public void navigatableRemoved(Navigatable nav) {+ @Override+ public void navigatableRemoved(Navigatable nav) {navigatable = null;beforeMemento = null;afterMemento = null;diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/state/analysis/MySwitchAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/util/state/analysis/MySwitchAnalyzer.javaindex 52d038b1fb..741f06203d 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/util/state/analysis/MySwitchAnalyzer.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/state/analysis/MySwitchAnalyzer.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.@@ -276,6 +276,7 @@ System.out.println("Time to build ResultState = " + t + " msec.");return null;}+ @Overridepublic void dataReference(PcodeOp op, int instrOpIndex,Varnode storageVarnode, RefType refType, TaskMonitor monitor)throws CancelledException {@@ -283,6 +284,7 @@ System.out.println("Time to build ResultState = " + t + " msec.");}+ @Overridepublic void indirectDataReference(PcodeOp op, int instrOpIndex,Varnode offsetVarnode, int size, int storageSpaceID,RefType refType, TaskMonitor monitor) throws CancelledException {@@ -290,6 +292,7 @@ System.out.println("Time to build ResultState = " + t + " msec.");}+ @Overridepublic boolean resolvedFlow(PcodeOp op, int instrOpIndex, Address destAddr,ContextState currentState, ResultsState results, TaskMonitor monitor)throws CancelledException {@@ -297,6 +300,7 @@ System.out.println("Time to build ResultState = " + t + " msec.");return false;}+ @Overridepublic void stackReference(PcodeOp op, int instrOpIndex, int stackOffset,int size, int storageSpaceID, RefType refType, TaskMonitor monitor)throws CancelledException {@@ -304,6 +308,7 @@ System.out.println("Time to build ResultState = " + t + " msec.");}+ @Overridepublic void stackReference(PcodeOp op, int instrOpIndex,VarnodeOperation computedStackOffset, int size, int storageSpaceID,RefType refType, TaskMonitor monitor) throws CancelledException {@@ -311,6 +316,7 @@ System.out.println("Time to build ResultState = " + t + " msec.");}+ @Overridepublic List<Address> unresolvedIndirectFlow(PcodeOp op, int instrOpIndex,Varnode destination, ContextState currentState,ResultsState results, TaskMonitor monitor)diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/AddressTableLengthTableColumn.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/AddressTableLengthTableColumn.javaindex e65879bb22..d0073d22dc 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/AddressTableLengthTableColumn.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/AddressTableLengthTableColumn.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.@@ -43,7 +43,8 @@ public class AddressTableLengthTableColumnreturn Integer.valueOf(rowObject.getNumberAddressEntries());}- public ProgramLocation getProgramLocation(AddressTable rowObject, Settings settings,+ @Override+ public ProgramLocation getProgramLocation(AddressTable rowObject, Settings settings,Program program, ServiceProvider serviceProvider) {return new ProgramLocation(program, rowObject.getTopAddress());}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromAddressTableColumn.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromAddressTableColumn.javaindex f5efaf1219..e5c73353bf 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromAddressTableColumn.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromAddressTableColumn.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.@@ -45,6 +45,7 @@ public class ReferenceFromAddressTableColumnreturn rowObject.getSource();}+ @Overridepublic ProgramLocation getProgramLocation(ReferenceAddressPair rowObject, Settings settings,Program program, ServiceProvider serviceProvider) {Address address = getValue(rowObject, null, program, serviceProvider);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromFunctionTableColumn.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromFunctionTableColumn.javaindex 7b31fb8dc7..e35ffe6c5b 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromFunctionTableColumn.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromFunctionTableColumn.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.@@ -47,6 +47,7 @@ public class ReferenceFromFunctionTableColumnreturn (fromFunction != null) ? fromFunction.toString() : null;}+ @Overridepublic ProgramLocation getProgramLocation(ReferenceAddressPair rowObject, Settings settings,Program program, ServiceProvider serviceProvider) {Address address = getFromAddress(rowObject);diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromLabelTableColumn.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromLabelTableColumn.javaindex e15752abbd..2408ca0274 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromLabelTableColumn.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceFromLabelTableColumn.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.@@ -59,6 +59,7 @@ public class ReferenceFromLabelTableColumnreturn symbolTable.getPrimarySymbol(fromAddress);}+ @Overridepublic ProgramLocation getProgramLocation(ReferenceAddressPair rowObject,Settings settings, Program program, ServiceProvider serviceProvider) {Symbol symbol = getSymbol( rowObject, program );diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceToAddressTableColumn.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceToAddressTableColumn.javaindex 06f88e7ff3..cfa8b752ff 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceToAddressTableColumn.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/field/ReferenceToAddressTableColumn.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.@@ -45,6 +45,7 @@ public class ReferenceToAddressTableColumnreturn rowObject.getDestination();}+ @Overridepublic ProgramLocation getProgramLocation(ReferenceAddressPair rowObject, Settings settings,Program program, ServiceProvider serviceProvider) {Address address = getValue(rowObject,null,program,serviceProvider);diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/BookmarkMergeManagerTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/BookmarkMergeManagerTest.javaindex 7afef7b6d0..23e8ee23fc 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/BookmarkMergeManagerTest.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/BookmarkMergeManagerTest.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.@@ -44,6 +44,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testAddLatest() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr = addr(program, "0x10028b1");@@ -51,6 +52,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {"Test bookmark @ 0x10028b1");}+ @Overridepublic void modifyPrivate(ProgramDB program) {}});@@ -65,9 +67,11 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testAddMy() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr = addr(program, "0x10028b1");@@ -86,6 +90,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testAddSame() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr = addr(program, "0x10028b1");@@ -93,6 +98,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {"Test bookmark @ 0x10028b1");}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr = addr(program, "0x10028b1");@@ -111,6 +117,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testAddDiffPickLatest() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr = addr(program, "0x10028b1");@@ -118,6 +125,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {"Test bookmark @ 0x10028b1");}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr = addr(program, "0x10028b1");@@ -136,6 +144,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testAddDiffPickMy() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr = addr(program, "0x10028b1");@@ -143,6 +152,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {"Test bookmark @ 0x10028b1");}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr = addr(program, "0x10028b1");@@ -161,6 +171,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testChangeLatest() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr;@@ -182,6 +193,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {bookmarks[0].set("NewCat", "This is a new analysis comment.");}+ @Overridepublic void modifyPrivate(ProgramDB program) {}});@@ -201,9 +213,11 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testChangeMy() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr;@@ -241,6 +255,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testChangeSame() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr;@@ -262,6 +277,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {bookmarks[0].set("NewCat", "This is a new analysis comment.");}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Address addr;@@ -299,6 +315,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testChangeDiff() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();bookMgr.setBookmark(addr(program, "0x1001978"), BookmarkType.ANALYSIS,@@ -307,6 +324,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {"Found Code", "Latest bookmark @ 0x100248f");}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();bookMgr.setBookmark(addr(program, "0x1001978"), BookmarkType.ANALYSIS,@@ -330,6 +348,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testRemoveLatest() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Bookmark[] bookmarks;@@ -338,6 +357,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {bookMgr.removeBookmark(bookmarks[0]);}+ @Overridepublic void modifyPrivate(ProgramDB program) {}});@@ -355,9 +375,11 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testRemoveMy() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Bookmark[] bookmarks;@@ -380,6 +402,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testRemoveSame() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Bookmark[] bookmarks;@@ -388,6 +411,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {bookMgr.removeBookmark(bookmarks[0]);}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Bookmark[] bookmarks;@@ -410,6 +434,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testChangeLatestRemoveMy() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();bookMgr.setBookmark(addr(program, "0x1001978"), BookmarkType.ANALYSIS,@@ -418,6 +443,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {"Found Code", "Latest bookmark @ 0x100248f");}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Bookmark[] bookmarks;@@ -444,6 +470,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {public void testChangeMyRemoveLatest() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Bookmark[] bookmarks;@@ -455,6 +482,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {bookMgr.removeBookmark(bookmarks[0]);}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();bookMgr.setBookmark(addr(program, "0x1001978"), BookmarkType.ANALYSIS,@@ -476,6 +504,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {private void setupUseForAll() throws Exception {mtf.initialize("NotepadMergeListingTest", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();Bookmark[] bookmarks;@@ -487,6 +516,7 @@ public class BookmarkMergeManagerTest extends AbstractListingMergeManagerTest {bookMgr.removeBookmark(bookmarks[0]);}+ @Overridepublic void modifyPrivate(ProgramDB program) {BookmarkManager bookMgr = program.getBookmarkManager();bookMgr.setBookmark(addr(program, "0x1001978"), BookmarkType.ANALYSIS,diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/CodeUnitMergeManagerOverrideTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/CodeUnitMergeManagerOverrideTest.javaindex c38d3eb274..6ad9fa5a27 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/CodeUnitMergeManagerOverrideTest.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/CodeUnitMergeManagerOverrideTest.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.@@ -45,12 +45,14 @@ public class CodeUnitMergeManagerOverrideTest extends AbstractListingMergeManagepublic void testAddLatestFlowOverride() throws Exception {mtf.initialize("DiffTestPgm1", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));instruction.setFlowOverride(FlowOverride.BRANCH);}+ @Overridepublic void modifyPrivate(ProgramDB program) {// Do nothing.}@@ -67,10 +69,12 @@ public class CodeUnitMergeManagerOverrideTest extends AbstractListingMergeManagepublic void testAddMyFlowOverride() throws Exception {mtf.initialize("DiffTestPgm1", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {// Do nothing.}+ @Overridepublic void modifyPrivate(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));@@ -89,12 +93,14 @@ public class CodeUnitMergeManagerOverrideTest extends AbstractListingMergeManagepublic void testAddLatestFlowOverrideMyFlowOverridePickLatest() throws Exception {mtf.initialize("DiffTestPgm1", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));instruction.setFlowOverride(FlowOverride.BRANCH);}+ @Overridepublic void modifyPrivate(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));@@ -114,12 +120,14 @@ public class CodeUnitMergeManagerOverrideTest extends AbstractListingMergeManagepublic void testAddLatestFlowOverrideMyFlowOverridePickMy() throws Exception {mtf.initialize("DiffTestPgm1", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));instruction.setFlowOverride(FlowOverride.BRANCH);}+ @Overridepublic void modifyPrivate(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));@@ -139,12 +147,14 @@ public class CodeUnitMergeManagerOverrideTest extends AbstractListingMergeManagepublic void testAddLatestFlowOverrideMyFlowOverridePickOrig() throws Exception {mtf.initialize("DiffTestPgm1", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));instruction.setFlowOverride(FlowOverride.BRANCH);}+ @Overridepublic void modifyPrivate(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));@@ -164,12 +174,14 @@ public class CodeUnitMergeManagerOverrideTest extends AbstractListingMergeManagepublic void testSameFlowOverrideLatestMy() throws Exception {mtf.initialize("DiffTestPgm1", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));instruction.setFlowOverride(FlowOverride.BRANCH);}+ @Overridepublic void modifyPrivate(ProgramDB program) {Instruction instruction =program.getListing().getInstructionAt(addr(program, "0100354f"));diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/DelaySlotCodeUnitMergeManagerTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/DelaySlotCodeUnitMergeManagerTest.javaindex 4a8a30a003..7e93ce7898 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/DelaySlotCodeUnitMergeManagerTest.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/DelaySlotCodeUnitMergeManagerTest.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.@@ -44,6 +44,7 @@ public class DelaySlotCodeUnitMergeManagerTest extends AbstractListingMergeManagmtf.initialize("r4000", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) throws Exception {Listing listing = program.getListing();listing.clearCodeUnits(addr(program, "80b4"), addr(program, "80bb"), false);@@ -53,6 +54,7 @@ public class DelaySlotCodeUnitMergeManagerTest extends AbstractListingMergeManagdisassembler.disassemble(addr(program, "80b4"), null);}+ @Overridepublic void modifyPrivate(ProgramDB program) throws Exception {Listing listing = program.getListing();listing.clearCodeUnits(addr(program, "80b0"), addr(program, "80bf"), false);@@ -76,6 +78,7 @@ public class DelaySlotCodeUnitMergeManagerTest extends AbstractListingMergeManagpublic void testAddLatestDelaySlot2() throws Exception {mtf.initialize("r4000", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) throws Exception {Listing listing = program.getListing();listing.clearCodeUnits(addr(program, "80b4"), addr(program, "80bb"), false);@@ -85,6 +88,7 @@ public class DelaySlotCodeUnitMergeManagerTest extends AbstractListingMergeManagdisassembler.disassemble(addr(program, "80b4"), null);}+ @Overridepublic void modifyPrivate(ProgramDB program) throws Exception {Listing listing = program.getListing();listing.clearCodeUnits(addr(program, "80b0"), addr(program, "80bf"), false);@@ -109,6 +113,7 @@ public class DelaySlotCodeUnitMergeManagerTest extends AbstractListingMergeManagmtf.initialize("r4000", new ProgramModifierListener() {+ @Overridepublic void modifyLatest(ProgramDB program) throws Exception {Listing listing = program.getListing();listing.clearCodeUnits(addr(program, "80b4"), addr(program, "80bb"), false);@@ -118,6 +123,7 @@ public class DelaySlotCodeUnitMergeManagerTest extends AbstractListingMergeManagdisassembler.disassemble(addr(program, "80b4"), null);}+ @Overridepublic void modifyPrivate(ProgramDB program) throws Exception {Listing listing = program.getListing();listing.clearCodeUnits(addr(program, "80b0"), addr(program, "80bf"), false);diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/map/AddressRangeMap32BitTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/map/AddressRangeMap32BitTest.javaindex 7b0f4dbbaf..e2589ecfb8 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/map/AddressRangeMap32BitTest.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/map/AddressRangeMap32BitTest.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.@@ -22,6 +22,7 @@ import ghidra.program.model.lang.*;public class AddressRangeMap32BitTest extends AbstractAddressRangeMapTest {+ @Overrideprotected ProgramDB createProgram() throws IOException {LanguageService service = getLanguageService();Language language = service.getLanguage(new LanguageID("sparc:BE:32:default"));diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/map/AddressRangeMap64BitTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/map/AddressRangeMap64BitTest.javaindex 952a7cc70a..c92836585a 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/map/AddressRangeMap64BitTest.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/map/AddressRangeMap64BitTest.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.@@ -24,6 +24,7 @@ import ghidra.program.model.lang.*;public class AddressRangeMap64BitTest extends AbstractAddressRangeMapTest {+ @Overrideprotected ProgramDB createProgram() throws IOException {LanguageService service = getLanguageService();Language language = service.getLanguage(new LanguageID("sparc:BE:64:default"));diff --git a/Ghidra/Features/Base/src/test/java/ghidra/JunitTestScan.java b/Ghidra/Features/Base/src/test/java/ghidra/JunitTestScan.javaindex 38670ddb7c..c6956c91f5 100644--- a/Ghidra/Features/Base/src/test/java/ghidra/JunitTestScan.java+++ b/Ghidra/Features/Base/src/test/java/ghidra/JunitTestScan.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -25,6 +24,7 @@ import java.io.*;public class JunitTestScan {private static final FilenameFilter TEST_XML_FILTER = new FilenameFilter() {+ @Overridepublic boolean accept(File dir, String name) {return (name.startsWith("TEST-") && name.endsWith(".xml"));}diff --git a/Ghidra/Features/Base/src/test/java/ghidra/program/database/ProgramVolatilityTest.java b/Ghidra/Features/Base/src/test/java/ghidra/program/database/ProgramVolatilityTest.javaindex b598e6155a..6331adfbd4 100644--- a/Ghidra/Features/Base/src/test/java/ghidra/program/database/ProgramVolatilityTest.java+++ b/Ghidra/Features/Base/src/test/java/ghidra/program/database/ProgramVolatilityTest.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.@@ -36,6 +36,7 @@ public class ProgramVolatilityTest extends SleighLanguageVolatilityTest {boolean isPORTFDataVolatile;boolean isPORTGDataVolatile;+ @Overridepublic void setUp(Boolean symbolVolatile, Integer symbolSize, Boolean memoryVolatile, boolean reverse) throws Exception {super.setUp(symbolVolatile, symbolSize, memoryVolatile, reverse);diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/gui/ClosedPatternTableModel.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/gui/ClosedPatternTableModel.javaindex be2d50dd9f..d9fd226962 100644--- a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/gui/ClosedPatternTableModel.java+++ b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/gui/ClosedPatternTableModel.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.@@ -56,6 +56,7 @@ public class ClosedPatternTableModel extends ThreadedTableModelStub<ClosedPatter}protected GColumnRenderer<String> monospacedRenderer = new AbstractGColumnRenderer<String>() {+ @Overridepublic java.awt.Component getTableCellRendererComponent(docking.widgets.table.GTableCellRenderingData data) {Component component = super.getTableCellRendererComponent(data);diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/gui/PatternInfoTableModel.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/gui/PatternInfoTableModel.javaindex 51720e1cd3..769f830f44 100644--- a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/gui/PatternInfoTableModel.java+++ b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/gui/PatternInfoTableModel.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.@@ -54,6 +54,7 @@ public class PatternInfoTableModel extends ThreadedTableModelStub<PatternInfoRow}protected GColumnRenderer<String> monospacedRenderer = new AbstractGColumnRenderer<String>() {+ @Overridepublic Component getTableCellRendererComponent(docking.widgets.table.GTableCellRenderingData data) {Component component = super.getTableCellRendererComponent(data);diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/FileByteBlock.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/FileByteBlock.javaindex 704aaf62b0..02dfa7765d 100644--- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/FileByteBlock.java+++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/FileByteBlock.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.@@ -41,6 +41,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#getLocationRepresentation(int)*/+ @Overridepublic String getLocationRepresentation(BigInteger bigIndex) {int index = bigIndex.intValue();if (index < buf.length) {@@ -49,6 +50,7 @@ class FileByteBlock implements ByteBlock {return null;}+ @Overridepublic int getMaxLocationRepresentationSize() {return 8;}@@ -56,6 +58,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#getIndexName()*/+ @Overridepublic String getIndexName() {return "Bytes";}@@ -63,6 +66,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#getLength()*/+ @Overridepublic BigInteger getLength() {return BigInteger.valueOf(buf.length);}@@ -70,6 +74,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#getByte(int)*/+ @Overridepublic byte getByte(BigInteger bigIndex) throws ByteBlockAccessException {int index = bigIndex.intValue();if (index < buf.length) {@@ -81,6 +86,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#getShort(int)*/+ @Overridepublic short getShort(BigInteger bigIndex) throws ByteBlockAccessException {int index = bigIndex.intValue();if (index < buf.length) {@@ -94,6 +100,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#getInt(int)*/+ @Overridepublic int getInt(BigInteger bigIndex) throws ByteBlockAccessException {int index = bigIndex.intValue();if (index < buf.length) {@@ -107,6 +114,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#getLong(int)*/+ @Overridepublic long getLong(BigInteger bigIndex) throws ByteBlockAccessException {int index = bigIndex.intValue();if (index < buf.length) {@@ -120,6 +128,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#setByte(int, byte)*/+ @Overridepublic void setByte(BigInteger bigIndex, byte value) throws ByteBlockAccessException {int index = bigIndex.intValue();if (index < buf.length) {@@ -130,6 +139,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#setShort(int, short)*/+ @Overridepublic void setShort(BigInteger bigIndex, short value) throws ByteBlockAccessException {int index = bigIndex.intValue();if (index < buf.length) {@@ -142,6 +152,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#setInt(int, int)*/+ @Overridepublic void setInt(BigInteger bigIndex, int value) throws ByteBlockAccessException {int index = bigIndex.intValue();if (index < buf.length) {@@ -154,6 +165,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#setLong(int, long)*/+ @Overridepublic void setLong(BigInteger bigIndex, long value) throws ByteBlockAccessException {int index = bigIndex.intValue();if (index < buf.length) {@@ -167,6 +179,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#isEditable()*/+ @Overridepublic boolean isEditable() {return false;}@@ -174,6 +187,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#setBigEndian(boolean)*/+ @Overridepublic void setBigEndian(boolean bigEndian) {if (this.bigEndian != bigEndian) {this.bigEndian = bigEndian;@@ -184,6 +198,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#isBigEndian()*/+ @Overridepublic boolean isBigEndian() {return bigEndian;}@@ -191,6 +206,7 @@ class FileByteBlock implements ByteBlock {/* (non-Javadoc)* @see ghidra.app.plugin.core.format.ByteBlock#getAlignment(int)*/+ @Overridepublic int getAlignment(int radix) {return 0;}diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/AddressFormatModel.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/AddressFormatModel.javaindex fae50cc1e0..85f0e6fe69 100644--- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/AddressFormatModel.java+++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/AddressFormatModel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -46,6 +45,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {/*** Get the name of this formatter.*/+ @Overridepublic String getName() {return "Address";}@@ -54,6 +54,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {* Get the number of bytes to make a unit; in this case it* takes 1 byte to make an Ascii value.*/+ @Overridepublic int getUnitByteSize() {return 1;}@@ -63,6 +64,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {* it returns a number from 0 to unit byte size - 1 indicating which* byte the character position was obtained from.*/+ @Overridepublic int getByteOffset(ByteBlock block, int position) {return 0;}@@ -70,6 +72,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {/*** Given the byte offset into a unit, get the column position.*/+ @Overridepublic int getColumnPosition(ByteBlock block, int byteOffset) {return 0;}@@ -78,6 +81,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {* Gets the number of characters required to display a* unit.*/+ @Overridepublic int getDataUnitSymbolSize() {return symbolSize;}@@ -90,6 +94,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic String getDataRepresentation(ByteBlock block, BigInteger index)throws ByteBlockAccessException {@@ -175,6 +180,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {/*** Returns true if the formatter allows values to be changed.*/+ @Overridepublic boolean isEditable() {return false;}@@ -191,6 +197,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {* attempt to put a 'z' in a hex unit.* block*/+ @Overridepublic boolean replaceValue(ByteBlock block, BigInteger index, int charPosition, char c) {return false;}@@ -198,6 +205,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {/*** Get the number of characters separating units.*/+ @Overridepublic int getUnitDelimiterSize() {return 0;}@@ -207,6 +215,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {* multiple units shown as one entity. This format does not* support groups.*/+ @Overridepublic int getGroupSize() {return 0;}@@ -216,6 +225,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {* support groups.* @throws UnsupportedOperationException*/+ @Overridepublic void setGroupSize(int groupSize) {throw new UnsupportedOperationException("groups are not supported");}@@ -223,6 +233,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {/*** @see ghidra.app.plugin.core.format.DataFormatModel#validateBytesPerLine(int)*/+ @Overridepublic boolean validateBytesPerLine(int bytesPerLine) {return true;}@@ -233,6 +244,7 @@ public class AddressFormatModel implements ProgramDataFormatModel {* are added as a view to Memory Viewer are created via a Factory within their* respective Formatter Plugin.*/+ @Overridepublic void setProgram(Program program) {if (program == null) {listing = null;@@ -247,10 +259,12 @@ public class AddressFormatModel implements ProgramDataFormatModel {/* (non-Javadoc)* @see ghidra.app.plugin.format.DataFormatModel#getHelpLocation()*/+ @Overridepublic HelpLocation getHelpLocation() {return new HelpLocation("ByteViewerPlugin", "Address");}+ @Overridepublic void dispose() {listing = null;memory = null;diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/AsciiFormatModel.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/AsciiFormatModel.javaindex f2e81a2569..10246fb473 100644--- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/AsciiFormatModel.java+++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/AsciiFormatModel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -35,6 +34,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {/*** Get the name of this formatter.*/+ @Overridepublic String getName() {return "Ascii";}@@ -43,6 +43,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {* Get the number of bytes to make a unit; in this case it* takes 1 byte to make an Ascii value.*/+ @Overridepublic int getUnitByteSize() {return 1;}@@ -52,6 +53,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {* it returns a number from 0 to unit byte size - 1 indicating which* byte the character position was obtained from.*/+ @Overridepublic int getByteOffset(ByteBlock block, int position) {return 0;}@@ -59,6 +61,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {/*** Given the byte offset into a unit, get the column position.*/+ @Overridepublic int getColumnPosition(ByteBlock block, int byteOffset) {return 0;}@@ -67,6 +70,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {* Gets the number of characters required to display a* unit.*/+ @Overridepublic int getDataUnitSymbolSize() {return symbolSize;}@@ -79,6 +83,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic String getDataRepresentation(ByteBlock block, BigInteger index)throws ByteBlockAccessException {@@ -99,6 +104,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {/*** Returns true if the formatter allows values to be changed.*/+ @Overridepublic boolean isEditable() {return true;}@@ -117,6 +123,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic boolean replaceValue(ByteBlock block, BigInteger index, int charPosition, char c)throws ByteBlockAccessException {@@ -141,6 +148,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {* support groups.* @throws UnsupportedOperationException*/+ @Overridepublic int getGroupSize() {return 0;}@@ -150,6 +158,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {* support groups.* @throws UnsupportedOperationException*/+ @Overridepublic void setGroupSize(int groupSize) {throw new UnsupportedOperationException("groups are not supported");}@@ -157,6 +166,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {/*** Get the number of characters separating units.*/+ @Overridepublic int getUnitDelimiterSize() {return 0;}@@ -164,6 +174,7 @@ public class AsciiFormatModel implements UniversalDataFormatModel {/*** @see ghidra.app.plugin.core.format.DataFormatModel#validateBytesPerLine(int)*/+ @Overridepublic boolean validateBytesPerLine(int bytesPerLine) {return true;}@@ -171,10 +182,12 @@ public class AsciiFormatModel implements UniversalDataFormatModel {/* (non-Javadoc)* @see ghidra.app.plugin.format.DataFormatModel#getHelpLocation()*/+ @Overridepublic HelpLocation getHelpLocation() {return new HelpLocation("ByteViewerPlugin", "Ascii");}+ @Overridepublic void dispose() {}diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/BinaryFormatModel.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/BinaryFormatModel.javaindex d251c28f45..15587231fa 100644--- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/BinaryFormatModel.java+++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/BinaryFormatModel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -36,6 +35,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {/*** Get the name of this formatter.*/+ @Overridepublic String getName() {return "Binary";}@@ -44,6 +44,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {* Get the number of bytes to make a unit; in this case,* returns 1.*/+ @Overridepublic int getUnitByteSize() {return 1;}@@ -53,6 +54,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {* it returns a number from 0 to unit byte size - 1 indicating which* byte the character position was obtained from.*/+ @Overridepublic int getByteOffset(ByteBlock block, int position) {return 0;}@@ -60,6 +62,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {/*** Given the byte offset into a unit, get the column position.*/+ @Overridepublic int getColumnPosition(ByteBlock block, int byteOffset) {return 0;}@@ -69,6 +72,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {* unit.* @return 8 for number of characters in the binary representation.*/+ @Overridepublic int getDataUnitSymbolSize() {return symbolSize;}@@ -81,6 +85,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic String getDataRepresentation(ByteBlock block, BigInteger index)throws ByteBlockAccessException {@@ -101,6 +106,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {/*** Returns true to allow values to be changed.*/+ @Overridepublic boolean isEditable() {return (true);}@@ -119,6 +125,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic boolean replaceValue(ByteBlock block, BigInteger index, int charPosition, char c)throws ByteBlockAccessException {@@ -152,6 +159,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {* multiple units shown as one entity. This format does not* support groups.*/+ @Overridepublic int getGroupSize() {return 1;}@@ -161,6 +169,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {* support groups.* @throws UnsupportedOperationException*/+ @Overridepublic void setGroupSize(int groupSize) {throw new UnsupportedOperationException("groups are not supported");}@@ -168,6 +177,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {/*** Get the number of characters separating units.*/+ @Overridepublic int getUnitDelimiterSize() {return 1;}@@ -175,6 +185,7 @@ public class BinaryFormatModel implements UniversalDataFormatModel {/*** @see ghidra.app.plugin.core.format.DataFormatModel#validateBytesPerLine(int)*/+ @Overridepublic boolean validateBytesPerLine(int bytesPerLine) {return true;}@@ -196,10 +207,12 @@ public class BinaryFormatModel implements UniversalDataFormatModel {/* (non-Javadoc)* @see ghidra.app.plugin.format.DataFormatModel#getHelpLocation()*/+ @Overridepublic HelpLocation getHelpLocation() {return new HelpLocation("ByteViewerPlugin", "Binary");}+ @Overridepublic void dispose() {// nothing to do}diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/HexFormatModel.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/HexFormatModel.javaindex 0dbdfc46d7..8bdf8f91e8 100644--- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/HexFormatModel.java+++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/HexFormatModel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -50,6 +49,7 @@ public class HexFormatModel implements UniversalDataFormatModel {/*** Get the name of this formatter.*/+ @Overridepublic String getName() {return NAME;}@@ -58,6 +58,7 @@ public class HexFormatModel implements UniversalDataFormatModel {* Get the number of bytes to make a unit; in this case,* returns 1.*/+ @Overridepublic int getUnitByteSize() {return unitByteSize;}@@ -67,6 +68,7 @@ public class HexFormatModel implements UniversalDataFormatModel {* unit.* @return 2 for number of characters in a unit*/+ @Overridepublic int getDataUnitSymbolSize() {return symbolSize;}@@ -74,6 +76,7 @@ public class HexFormatModel implements UniversalDataFormatModel {/*** Get number of units in a group.*/+ @Overridepublic int getGroupSize() {return groupSize;}@@ -81,6 +84,7 @@ public class HexFormatModel implements UniversalDataFormatModel {/*** Set the number of units in a group.*/+ @Overridepublic void setGroupSize(int groupSize) {this.groupSize = groupSize;unitByteSize = groupSize;@@ -98,6 +102,7 @@ public class HexFormatModel implements UniversalDataFormatModel {* Returns the byte used to generate the character at a given* position.*/+ @Overridepublic int getByteOffset(ByteBlock block, int pos) {if (prefixEnabled) {if (pos <= 3) {@@ -117,6 +122,7 @@ public class HexFormatModel implements UniversalDataFormatModel {/*** Given the byte offset into a unit, get the column position.*/+ @Overridepublic int getColumnPosition(ByteBlock block, int byteOffset) {if (prefixEnabled) {return byteOffset * 2 + 2;@@ -161,6 +167,7 @@ public class HexFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic String getDataRepresentation(ByteBlock block, BigInteger index)throws ByteBlockAccessException {@@ -227,6 +234,7 @@ public class HexFormatModel implements UniversalDataFormatModel {/*** Returns true to allow values to be changed.*/+ @Overridepublic boolean isEditable() {return true;}@@ -234,6 +242,7 @@ public class HexFormatModel implements UniversalDataFormatModel {/*** Get the number of characters separating units for display purposes.*/+ @Overridepublic int getUnitDelimiterSize() {return 1;}@@ -252,6 +261,7 @@ public class HexFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic boolean replaceValue(ByteBlock block, BigInteger index, int charPosition, char c)throws ByteBlockAccessException {@@ -287,6 +297,7 @@ public class HexFormatModel implements UniversalDataFormatModel {/*** @see ghidra.app.plugin.core.format.DataFormatModel#validateBytesPerLine(int)*/+ @Overridepublic boolean validateBytesPerLine(int bytesPerLine) {return true;}@@ -315,10 +326,12 @@ public class HexFormatModel implements UniversalDataFormatModel {/* (non-Javadoc)* @see ghidra.app.plugin.format.DataFormatModel#getHelpLocation()*/+ @Overridepublic HelpLocation getHelpLocation() {return new HelpLocation("ByteViewerPlugin", "Hex");}+ @Overridepublic void dispose() {}diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/IntegerFormatModel.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/IntegerFormatModel.javaindex 931c5093f1..1c0ac4962d 100644--- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/IntegerFormatModel.java+++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/IntegerFormatModel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -36,6 +35,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {/*** Get the name of this formatter.*/+ @Overridepublic String getName() {return "Integer";}@@ -44,6 +44,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {* Get the number of bytes to make a unit; in this case,* returns 4.*/+ @Overridepublic int getUnitByteSize() {return 4;}@@ -53,6 +54,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {* it returns a number from 0 to unit byte size - 1 indicating which* byte the character position was obtained from.*/+ @Overridepublic int getByteOffset(ByteBlock block, int position) {return 0;@@ -61,6 +63,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {/*** Given the byte offset into a unit, get the column position.*/+ @Overridepublic int getColumnPosition(ByteBlock block, int byteOffset) {return 0;}@@ -70,6 +73,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {* unit.* @return 4 for number of characters in the integer representation.*/+ @Overridepublic int getDataUnitSymbolSize() {return symbolSize;}@@ -82,6 +86,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic String getDataRepresentation(ByteBlock block, BigInteger index)throws ByteBlockAccessException {@@ -97,6 +102,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {/*** Returns false to allow no values to be changed.*/+ @Overridepublic boolean isEditable() {return false;}@@ -115,6 +121,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic boolean replaceValue(ByteBlock block, BigInteger index, int pos, char c)throws ByteBlockAccessException {@@ -126,6 +133,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {* multiple units shown as one entity. This format does not* support groups.*/+ @Overridepublic int getGroupSize() {return 1;}@@ -135,6 +143,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {* support groups.* @throws UnsupportedOperationException*/+ @Overridepublic void setGroupSize(int groupSize) {throw new UnsupportedOperationException("groups are not supported");}@@ -142,6 +151,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {/*** Get the number of characters separating units.*/+ @Overridepublic int getUnitDelimiterSize() {return 1;}@@ -149,6 +159,7 @@ public class IntegerFormatModel implements UniversalDataFormatModel {/*** @see ghidra.app.plugin.core.format.DataFormatModel#validateBytesPerLine(int)*/+ @Overridepublic boolean validateBytesPerLine(int bytesPerLine) {return bytesPerLine % 4 == 0;}@@ -177,10 +188,12 @@ public class IntegerFormatModel implements UniversalDataFormatModel {/* (non-Javadoc)* @see ghidra.app.plugin.format.DataFormatModel#getHelpLocation()*/+ @Overridepublic HelpLocation getHelpLocation() {return new HelpLocation("ByteViewerPlugin", "Integer");}+ @Overridepublic void dispose() {// nothing to do}diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/OctalFormatModel.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/OctalFormatModel.javaindex 3802d936a5..993d9204a6 100644--- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/OctalFormatModel.java+++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/OctalFormatModel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -36,6 +35,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {/*** Get the name of this formatter.*/+ @Overridepublic String getName() {return "Octal";}@@ -44,6 +44,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {* Get the number of bytes to make a unit; in this case,* returns 1.*/+ @Overridepublic int getUnitByteSize() {return 1;}@@ -53,6 +54,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {* it returns a number from 0 to unit byte size - 1 indicating which* byte the character position was obtained from.*/+ @Overridepublic int getByteOffset(ByteBlock block, int position) {return 0;}@@ -60,6 +62,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {/*** Given the byte offset into a unit, get the column position.*/+ @Overridepublic int getColumnPosition(ByteBlock block, int byteOffset) {return 0;}@@ -69,6 +72,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {* unit.* @return 3 for number of characters in the octal representation.*/+ @Overridepublic int getDataUnitSymbolSize() {return symbolSize;}@@ -81,6 +85,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic String getDataRepresentation(ByteBlock block, BigInteger index)throws ByteBlockAccessException {@@ -101,6 +106,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {/*** Returns true to allow values to be changed.*/+ @Overridepublic boolean isEditable() {return (true);}@@ -119,6 +125,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {* @throws IndexOutOfBoundsException if index is not valid for the* block*/+ @Overridepublic boolean replaceValue(ByteBlock block, BigInteger index, int charPosition, char c)throws ByteBlockAccessException {@@ -162,6 +169,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {* multiple units shown as one entity. This format does not* support groups.*/+ @Overridepublic int getGroupSize() {return 1;}@@ -171,6 +179,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {* support groups.* @throws UnsupportedOperationException*/+ @Overridepublic void setGroupSize(int groupSize) {throw new UnsupportedOperationException("groups are not supported");}@@ -178,6 +187,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {/*** Get the number of characters separating units.*/+ @Overridepublic int getUnitDelimiterSize() {return 1;}@@ -185,6 +195,7 @@ public class OctalFormatModel implements UniversalDataFormatModel {/*** @see ghidra.app.plugin.core.format.DataFormatModel#validateBytesPerLine(int)*/+ @Overridepublic boolean validateBytesPerLine(int bytesPerLine) {return true;}@@ -206,10 +217,12 @@ public class OctalFormatModel implements UniversalDataFormatModel {/* (non-Javadoc)* @see ghidra.app.plugin.format.DataFormatModel#getHelpLocation()*/+ @Overridepublic HelpLocation getHelpLocation() {return new HelpLocation("ByteViewerPlugin", "Octal");}+ @Overridepublic void dispose() {// nothing to do}diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/GraphASTAndFlowScript.java b/Ghidra/Features/Decompiler/ghidra_scripts/GraphASTAndFlowScript.javaindex 93b4c5b933..a2e4c1c655 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/GraphASTAndFlowScript.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/GraphASTAndFlowScript.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.@@ -22,6 +22,7 @@ import ghidra.app.services.GraphDisplayBroker;public class GraphASTAndFlowScript extends GraphASTScript {+ @Overrideprotected PCodeDfgGraphTask createTask(GraphDisplayBroker graphDisplayBroker) {return new PCodeCombinedGraphTask(state.getTool(), graphDisplayBroker, high);}diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/GraphSelectedASTScript.java b/Ghidra/Features/Decompiler/ghidra_scripts/GraphSelectedASTScript.javaindex 928fa6260e..063d22e6ba 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/GraphSelectedASTScript.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/GraphSelectedASTScript.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.@@ -21,6 +21,7 @@ import ghidra.app.plugin.core.decompile.actions.SelectedPCodeDfgGraphTask;import ghidra.app.services.GraphDisplayBroker;public class GraphSelectedASTScript extends GraphASTScript {+ @Overrideprotected PCodeDfgGraphTask createTask(GraphDisplayBroker graphDisplayBroker) {return new SelectedPCodeDfgGraphTask(state.getTool(), graphDisplayBroker, high,currentAddress);diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/GccTypeinfoRef.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/GccTypeinfoRef.javaindex 0a1d8d0730..52f2f876a4 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/GccTypeinfoRef.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/GccTypeinfoRef.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.@@ -30,10 +30,12 @@ public class GccTypeinfoRef extends TypeinfoRef{this.inVtable = inVtable;}+ @Overridepublic void setIsInVtable(Boolean setting) {inVtable = setting;}+ @Overridepublic Boolean isInVtable() {return inVtable;}diff --git a/Ghidra/Features/Decompiler/src/main/java/decompiler/DecompilerInitializer.java b/Ghidra/Features/Decompiler/src/main/java/decompiler/DecompilerInitializer.javaindex 005899ae39..15879ceffc 100644--- a/Ghidra/Features/Decompiler/src/main/java/decompiler/DecompilerInitializer.java+++ b/Ghidra/Features/Decompiler/src/main/java/decompiler/DecompilerInitializer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -20,7 +19,8 @@ import ghidra.app.plugin.core.comments.*;import ghidra.framework.*;public class DecompilerInitializer implements ModuleInitializer {- public void run() {+ @Override+ public void run() {PluggableServiceRegistry.registerPluggableService(CommentsActionFactory.class, new DecompilerCommentsActionFactory());}diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/flatapi/FlatDecompilerAPI.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/flatapi/FlatDecompilerAPI.javaindex 9313260470..5e47319457 100644--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/flatapi/FlatDecompilerAPI.java+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/flatapi/FlatDecompilerAPI.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -91,6 +90,7 @@ public class FlatDecompilerAPI implements Disposable {/*** Disposes of the decompiler resources by calling currentDecompiler.dispose().*/+ @Overridepublic void dispose() {if (decompiler != null) {decompiler.dispose();diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/SelectedPCodeDfgGraphTask.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/SelectedPCodeDfgGraphTask.javaindex a9a21e5ce7..ebb0bb24c9 100644--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/SelectedPCodeDfgGraphTask.java+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/SelectedPCodeDfgGraphTask.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.@@ -36,6 +36,7 @@ public class SelectedPCodeDfgGraphTask extends PCodeDfgGraphTask {this.address = address;}+ @Overrideprotected Iterator<PcodeOpAST> getPcodeOpIterator() {Iterator<PcodeOpAST> opiter = hfunction.getPcodeOps(address);return opiter;diff --git a/Ghidra/Features/Decompiler/src/test.slow/java/ghidra/app/plugin/core/decompile/DecompilerPspecVolatilityTest.java b/Ghidra/Features/Decompiler/src/test.slow/java/ghidra/app/plugin/core/decompile/DecompilerPspecVolatilityTest.javaindex d36e0adc93..ca3cb9198f 100644--- a/Ghidra/Features/Decompiler/src/test.slow/java/ghidra/app/plugin/core/decompile/DecompilerPspecVolatilityTest.java+++ b/Ghidra/Features/Decompiler/src/test.slow/java/ghidra/app/plugin/core/decompile/DecompilerPspecVolatilityTest.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.@@ -43,6 +43,7 @@ public class DecompilerPspecVolatilityTest extends SleighLanguageVolatilityTestprivate boolean decompilerPORTFVolatile;private boolean decompilerPORTGVolatile;+ @Overridepublic void setUp(Boolean symbolVolatile, Integer symbolSize, Boolean memoryVolatile,boolean reverse) throws Exception {super.setUp(symbolVolatile, symbolSize, memoryVolatile, reverse);diff --git a/Ghidra/Features/DecompilerDependent/ghidra_scripts/ExportPCodeForCTADL.java b/Ghidra/Features/DecompilerDependent/ghidra_scripts/ExportPCodeForCTADL.javaindex 345fe10790..ca831332cd 100644--- a/Ghidra/Features/DecompilerDependent/ghidra_scripts/ExportPCodeForCTADL.java+++ b/Ghidra/Features/DecompilerDependent/ghidra_scripts/ExportPCodeForCTADL.java@@ -60,10 +60,12 @@ class PcodeBlockBasicEdge implements GEdge<PcodeBlockBasicVertex> {this.end = end;}+ @Overridepublic PcodeBlockBasicVertex getStart() {return start;}+ @Overridepublic PcodeBlockBasicVertex getEnd() {return end;}diff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/string/variadic/FormatArgument.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/string/variadic/FormatArgument.javaindex f71909e425..1f2a5e2453 100644--- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/string/variadic/FormatArgument.java+++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/string/variadic/FormatArgument.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.@@ -56,6 +56,7 @@ public class FormatArgument {** @return FormatArgument as String*/+ @Overridepublic String toString() {return String.format("[%s, %s]", this.lengthModifier, this.conversionSpecifier);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/art/headers/ArtHeader_005.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/art/headers/ArtHeader_005.javaindex f57bd52964..7026c9906d 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/art/headers/ArtHeader_005.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/art/headers/ArtHeader_005.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.@@ -87,6 +87,7 @@ public class ArtHeader_005 extends ArtHeader {/*** Checksum of the oat file we link to for load time sanity check.*/+ @Overridepublic int getOatChecksum() {return oat_checksum_;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v1/FBPKv1_Partition.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v1/FBPKv1_Partition.javaindex 9dc0a074c6..453a35de66 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v1/FBPKv1_Partition.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v1/FBPKv1_Partition.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.@@ -78,6 +78,7 @@ public class FBPKv1_Partition extends FBPK_Partition {return dataSize;}+ @Overridepublic int getOffsetToNextPartitionTable() {return offsetToNextPartitionTable;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v1/FBPTv1_Entry.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v1/FBPTv1_Entry.javaindex 7b1c2b5756..535cd673e4 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v1/FBPTv1_Entry.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v1/FBPTv1_Entry.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.@@ -52,6 +52,7 @@ public class FBPTv1_Entry extends FBPT_Entry {}}+ @Overridepublic String getName() {return name;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v2/FBPTv2_Entry.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v2/FBPTv2_Entry.javaindex 9c5091b7cb..b13a6cb08b 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v2/FBPTv2_Entry.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v2/FBPTv2_Entry.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.@@ -46,6 +46,7 @@ public class FBPTv2_Entry extends FBPT_Entry {unknown3 = reader.readNextInt();}+ @Overridepublic String getName() {return name;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/headers/OatHeader_007.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/headers/OatHeader_007.javaindex 8266a14b51..b25d81e08a 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/headers/OatHeader_007.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/headers/OatHeader_007.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.@@ -72,6 +72,7 @@ public class OatHeader_007 extends OatHeader {return -1;//not supported}+ @Overridepublic int getChecksum() {return adler32_checksum_;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/oatclass/OatClass_Lollipop.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/oatclass/OatClass_Lollipop.javaindex 9f5702c4c5..f657cd3af4 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/oatclass/OatClass_Lollipop.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/oatclass/OatClass_Lollipop.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.@@ -84,6 +84,7 @@ public class OatClass_Lollipop extends OatClass {* @param methodIndex the method index* @return true if this method index is declared native in the bitmap*/+ @Overridepublic boolean isMethodNative(int methodIndex) {int bytePos = methodIndex / 8;int bitPos = methodIndex % 8;diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/oatclass/OatClass_S_T.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/oatclass/OatClass_S_T.javaindex cfd989e76c..639b691a15 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/oatclass/OatClass_S_T.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/oatclass/OatClass_S_T.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.@@ -88,6 +88,7 @@ public class OatClass_S_T extends OatClass {* @param methodIndex the method index* @return true if this method index is declared native in the bitmap*/+ @Overridepublic boolean isMethodNative(int methodIndex) {int bytePos = (methodIndex / 8);int bitPos = methodIndex % 8;diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Lollipop.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Lollipop.javaindex c803618280..9e322ae3b8 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Lollipop.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Lollipop.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.@@ -65,6 +65,7 @@ public class OatQuickMethodHeader_Lollipop extends OatQuickMethodHeader {* The code size in bytes.* @return the code size in bytes*/+ @Overridepublic int getCodeSize() {return code_size_;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_LollipopMR1.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_LollipopMR1.javaindex 93e276a5cf..b709cc975d 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_LollipopMR1.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_LollipopMR1.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.@@ -79,6 +79,7 @@ public class OatQuickMethodHeader_LollipopMR1 extends OatQuickMethodHeader {* The code size in bytes.* @return code size in bytes*/+ @Overridepublic int getCodeSize() {return code_size_;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Nougat.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Nougat.javaindex 9a692f9841..2344433aa3 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Nougat.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Nougat.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.@@ -62,6 +62,7 @@ public class OatQuickMethodHeader_Nougat extends OatQuickMethodHeader {* The code size in bytes.* @return the code size*/+ @Overridepublic int getCodeSize() {return code_size_;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Oreo.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Oreo.javaindex 2a827e60ce..de44b943bd 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Oreo.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Oreo.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.@@ -79,6 +79,7 @@ public class OatQuickMethodHeader_Oreo extends OatQuickMethodHeader {* The code size in bytes. The highest bit is used to signify if the compiled* code with the method header has should_deoptimize flag.*/+ @Overridepublic int getCodeSize() {return code_size_;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Q_R.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Q_R.javaindex 3b41837bab..fb86e572b0 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Q_R.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/quickmethod/OatQuickMethodHeader_Q_R.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.@@ -49,6 +49,7 @@ public class OatQuickMethodHeader_Q_R extends OatQuickMethodHeader {* The code size in bytes.* @return the code size*/+ @Overridepublic int getCodeSize() {return code_size_;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_006.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_006.javaindex af7498d12f..2940559071 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_006.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_006.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.@@ -52,6 +52,7 @@ public class VdexHeader_006 extends VdexHeader {dex_checksums_ = reader.readNextIntArray(number_of_dex_files_);}+ @Overridepublic void parse(BinaryReader reader, TaskMonitor monitor)throws IOException, CancelledException {monitor.setMessage("Parsing DEX files inside VDEX (oreo)...");@@ -75,6 +76,7 @@ public class VdexHeader_006 extends VdexHeader {//stringTable = new VdexStringTable( reader );}+ @Overridepublic String getVersion() {return version_;}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_019.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_019.javaindex dc8cb3f677..9d48f606b5 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_019.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_019.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.@@ -91,6 +91,7 @@ public class VdexHeader_019 extends VdexHeader {return verifier_deps_version_;}+ @Overridepublic void parse(BinaryReader reader, TaskMonitor monitor)throws IOException, CancelledException {//do nothingdiff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_021.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_021.javaindex b3b58c3922..8334bba7c1 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_021.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/vdex/headers/VdexHeader_021.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.@@ -96,6 +96,7 @@ public class VdexHeader_021 extends VdexHeader {return verifier_deps_version_;}+ @Overridepublic void parse(BinaryReader reader, TaskMonitor monitor)throws IOException, CancelledException {//do nothingdiff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/bplist/NSObject.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/bplist/NSObject.javaindex 007fec307f..64eb91a98d 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/bplist/NSObject.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/bplist/NSObject.java@@ -36,6 +36,7 @@ public abstract class NSObject implements StructConverter {public abstract String getType();+ @Overridepublic abstract String toString();protected void addHeader( Structure structure, int size ) {diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/apport/ApportHeader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/apport/ApportHeader.javaindex 8ba095f892..52fa61fb5b 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/apport/ApportHeader.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/apport/ApportHeader.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.@@ -127,6 +127,7 @@ public class ApportHeader implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() {StructureDataType struct = new StructureDataType(NAME, 0);for (int i = 0; i < lineCount; i++) {diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/cmd/DumpPeShim.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/cmd/DumpPeShim.javaindex 086caebd72..2b3642c968 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/cmd/DumpPeShim.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/cmd/DumpPeShim.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.@@ -100,10 +100,12 @@ public class DumpPeShim extends PeLoader {}}+ @Overrideprotected SectionLayout getSectionLayout() {return SectionLayout.MEMORY;}+ @Overrideprotected FileBytes createFileBytes(ByteProvider provider, Program pgm, TaskMonitor monitor)throws IOException, CancelledException {List<FileBytes> fileBytesList = pgm.getMemory().getAllFileBytes();@@ -130,6 +132,7 @@ public class DumpPeShim extends PeLoader {}}+ @Overrideprotected Map<SectionHeader, Address> processMemoryBlocks(PortableExecutable pe, Program prog,FileBytes fileBytes, TaskMonitor monitor, MessageLog log)throws AddressOverflowException {diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamA.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamA.javaindex eded172745..ad3a22e461 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamA.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamA.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.@@ -51,6 +51,7 @@ public class CommentStreamA implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamW.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamW.javaindex 45d644559f..49f488e8f0 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamW.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamW.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.@@ -51,6 +51,7 @@ public class CommentStreamW implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CvRecord.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CvRecord.javaindex d91b7b5fb4..e718604287 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CvRecord.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CvRecord.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.@@ -62,6 +62,7 @@ public class CvRecord implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Directory.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Directory.javaindex 7ed49b260f..898ed733f9 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Directory.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Directory.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.@@ -74,6 +74,7 @@ public class Directory implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ExceptionStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ExceptionStream.javaindex 7d2837aa79..02b784d0c0 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ExceptionStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ExceptionStream.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.@@ -101,6 +101,7 @@ public class ExceptionStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/FunctionTable.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/FunctionTable.javaindex 6db48cd025..29948d89c1 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/FunctionTable.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/FunctionTable.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.@@ -56,6 +56,7 @@ public class FunctionTable implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/FunctionTableStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/FunctionTableStream.javaindex 2d5e3d6988..6977dc1808 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/FunctionTableStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/FunctionTableStream.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.@@ -62,6 +62,7 @@ public class FunctionTableStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Handle.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Handle.javaindex 755a32312d..5873222015 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Handle.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Handle.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.@@ -69,6 +69,7 @@ public class Handle implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/HandleDataStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/HandleDataStream.javaindex 0fbb61573a..5c73198612 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/HandleDataStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/HandleDataStream.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.@@ -57,6 +57,7 @@ public class HandleDataStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/HandleOperationListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/HandleOperationListStream.javaindex 12c59299df..fbda5fcbe1 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/HandleOperationListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/HandleOperationListStream.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.@@ -56,6 +56,7 @@ public class HandleOperationListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MdmpFileHeader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MdmpFileHeader.javaindex 7617a65690..23f6f1a503 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MdmpFileHeader.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MdmpFileHeader.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.@@ -59,6 +59,7 @@ public class MdmpFileHeader implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Memory64ListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Memory64ListStream.javaindex 0924e78243..327e4918dc 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Memory64ListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Memory64ListStream.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.@@ -54,6 +54,7 @@ public class Memory64ListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryInfo.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryInfo.javaindex bf9da14b1d..5555ee34c6 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryInfo.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryInfo.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.@@ -62,6 +62,7 @@ public class MemoryInfo implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryInfoListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryInfoListStream.javaindex 931366f68f..0e65628eb5 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryInfoListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryInfoListStream.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.@@ -56,6 +56,7 @@ public class MemoryInfoListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryListStream.javaindex bc6ba3a85b..e5e62c41bf 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryListStream.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.@@ -52,6 +52,7 @@ public class MemoryListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryRange64.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryRange64.javaindex d61659c0d0..887b5d65db 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryRange64.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryRange64.java@@ -56,6 +56,7 @@ public class MemoryRange64 implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MiscInfoStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MiscInfoStream.javaindex a4de5f92dc..de858c5dc2 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MiscInfoStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MiscInfoStream.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.@@ -124,6 +124,7 @@ public class MiscInfoStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ModuleListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ModuleListStream.javaindex 279b77fd45..575f0fb83f 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ModuleListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ModuleListStream.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.@@ -52,6 +52,7 @@ public class ModuleListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ProcessVmCountersStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ProcessVmCountersStream.javaindex 58665918cd..5fd4a94d54 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ProcessVmCountersStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ProcessVmCountersStream.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.@@ -96,6 +96,7 @@ public class ProcessVmCountersStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/SystemInfoStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/SystemInfoStream.javaindex dad620084a..50a38aaa18 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/SystemInfoStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/SystemInfoStream.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.@@ -94,6 +94,7 @@ public class SystemInfoStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadExListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadExListStream.javaindex 02cf5b91ec..effd49f12f 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadExListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadExListStream.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.@@ -52,6 +52,7 @@ public class ThreadExListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadInfo.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadInfo.javaindex 8b16cb304f..ac5b0da519 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadInfo.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadInfo.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.@@ -66,6 +66,7 @@ public class ThreadInfo implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadInfoListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadInfoListStream.javaindex a83a7fa7b2..6e255b3431 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadInfoListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadInfoListStream.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.@@ -56,6 +56,7 @@ public class ThreadInfoListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadListStream.javaindex 191472c0cd..fc76277f5d 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/ThreadListStream.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.@@ -52,6 +52,7 @@ public class ThreadListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Token.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Token.javaindex 69228c3905..8f508c0cf2 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Token.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/Token.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.@@ -53,6 +53,7 @@ public class Token implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/TokenListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/TokenListStream.javaindex db4d23e2ca..b23314e77e 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/TokenListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/TokenListStream.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.@@ -58,6 +58,7 @@ public class TokenListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/UnloadedModuleListStream.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/UnloadedModuleListStream.javaindex 31b7a0b06f..63fb3f7bfb 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/UnloadedModuleListStream.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/UnloadedModuleListStream.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.@@ -56,6 +56,7 @@ public class UnloadedModuleListStream implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/ExceptionRecord.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/ExceptionRecord.javaindex b2edcc0d2c..95ac23d1da 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/ExceptionRecord.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/ExceptionRecord.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.@@ -56,6 +56,7 @@ public class ExceptionRecord implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/MmPfn.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/MmPfn.javaindex dc13ea9cc5..0f679834ad 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/MmPfn.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/MmPfn.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.@@ -60,6 +60,7 @@ public class MmPfn implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/PhysicalMemoryDescriptor.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/PhysicalMemoryDescriptor.javaindex 6886bdb1d3..d8c6513d48 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/PhysicalMemoryDescriptor.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/PhysicalMemoryDescriptor.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.@@ -59,6 +59,7 @@ public class PhysicalMemoryDescriptor implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/PhysicalMemoryRun.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/PhysicalMemoryRun.javaindex b831922982..886ff564f7 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/PhysicalMemoryRun.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/PhysicalMemoryRun.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.@@ -50,6 +50,7 @@ public class PhysicalMemoryRun implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/SummaryHeader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/SummaryHeader.javaindex abb9feb4a7..4492c54a8a 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/SummaryHeader.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/pagedump/SummaryHeader.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.@@ -62,6 +62,7 @@ public class SummaryHeader implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/DebugInfo.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/DebugInfo.javaindex 04491e852b..60b4f3ec09 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/DebugInfo.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/DebugInfo.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.@@ -66,6 +66,7 @@ public class DebugInfo implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/MemoryInfo.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/MemoryInfo.javaindex 916d237606..9646d214a2 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/MemoryInfo.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/MemoryInfo.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.@@ -62,6 +62,7 @@ public class MemoryInfo implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/MemoryRange.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/MemoryRange.javaindex 836ef5cff9..cb84c5b91b 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/MemoryRange.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/MemoryRange.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.@@ -52,6 +52,7 @@ public class MemoryRange implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {StructureDataType struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/UserdumpFileHeader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/UserdumpFileHeader.javaindex 71a299dab7..20e06d3dba 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/UserdumpFileHeader.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/userdump/UserdumpFileHeader.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.@@ -75,6 +75,7 @@ public class UserdumpFileHeader implements StructConverter {/*** @see ghidra.app.util.bin.StructConverter#toDataType()*/+ @Overridepublic DataType toDataType() throws DuplicateNameException {Structure struct = new StructureDataType(NAME, 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/apple8900/Apple8900Decryptor.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/apple8900/Apple8900Decryptor.javaindex ee3598cf79..1389854c15 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/apple8900/Apple8900Decryptor.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/apple8900/Apple8900Decryptor.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.@@ -29,11 +29,13 @@ import ghidra.util.task.TaskMonitor;public class Apple8900Decryptor implements Decryptor {+ @Overridepublic boolean isValid( ByteProvider provider ) throws IOException {byte [] bytes = provider.readBytes( 0, 4 );return Arrays.equals( bytes, Apple8900Constants.MAGIC_BYTES );}+ @Overridepublic DecryptedPacket decrypt( String firmwareName, String firmwarePath, ByteProvider provider, TaskMonitor monitor ) throws IOException, CryptoException {BinaryReader reader = new BinaryReader( provider, true );diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/dmg/DmgHeaderV2.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/dmg/DmgHeaderV2.javaindex 88022576b1..ae5b933051 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/dmg/DmgHeaderV2.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/dmg/DmgHeaderV2.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.@@ -58,6 +58,7 @@ public class DmgHeaderV2 extends DmgHeader {public byte [] getSignature() {return signature;}+ @Overridepublic int getVersion() {return version;}@@ -85,13 +86,16 @@ public class DmgHeaderV2 extends DmgHeader {public int getBlockSize() {return blockSize;}+ @Overridepublic long getDataOffset() {return dataOffset;}+ @Overridepublic long getDataSize() {return dataSize;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {StructureDataType struct = (StructureDataType)StructConverterUtil.toDataType( this );DataTypeComponent component0 = struct.getComponent(0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/ibootim/iBootImHeader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/ibootim/iBootImHeader.javaindex e9dfec0626..d7edfbfb2e 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/ibootim/iBootImHeader.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/ibootim/iBootImHeader.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.@@ -65,6 +65,7 @@ public class iBootImHeader implements StructConverter {return padding;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure struct = new StructureDataType(StructConverterUtil.parseName(iBootImHeader.class), 0);struct.add(STRING, iBootImConstants.SIGNATURE_LENGTH, "signature", null);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img3/AbstractImg3Tag.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img3/AbstractImg3Tag.javaindex 58e5c6665c..22b5b7ea9c 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img3/AbstractImg3Tag.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img3/AbstractImg3Tag.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.@@ -47,6 +47,7 @@ public abstract class AbstractImg3Tag implements StructConverter {return dataLength;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img3/Img3.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img3/Img3.javaindex fc627f542d..e7d8ccf082 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img3/Img3.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img3/Img3.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.@@ -86,6 +86,7 @@ public class Img3 implements StructConverter {return tmp;}+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {return StructConverterUtil.toDataType(this);}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2Data.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2Data.javaindex 2f98adbf63..180d4bc2b3 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2Data.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2Data.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.@@ -27,6 +27,7 @@ public class YAFFS2Data implements StructConverter {}// an array to hold data bytes for one record+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure structure = new StructureDataType("yaffs2Data", 0);structure.add(new ArrayDataType(BYTE, YAFFS2Constants.DATA_BUFFER_SIZE, BYTE.getLength()),diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2ExtendedTags.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2ExtendedTags.javaindex c155de32b3..e2dbfae907 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2ExtendedTags.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2ExtendedTags.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.@@ -77,6 +77,7 @@ public class YAFFS2ExtendedTags implements StructConverter {}// extended tags structure for analyzer+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure structure = new StructureDataType("yaffs2Tags", 0);diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2Header.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2Header.javaindex e5a04fa79e..a765d3adbb 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2Header.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/yaffs2/YAFFS2Header.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.@@ -186,6 +186,7 @@ public class YAFFS2Header implements StructConverter {}// header structure for analyzer+ @Overridepublic DataType toDataType() throws DuplicateNameException, IOException {Structure structure = new StructureDataType( "yaffs2Hdr", 0 );diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/image/GImageConverter.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/image/GImageConverter.javaindex a98f4974af..4e91483473 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/image/GImageConverter.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/image/GImageConverter.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.@@ -111,6 +111,7 @@ public class GImageConverter {final Icon icon = image.toPNG();SwingUtilities.invokeLater(new Runnable() {+ @Overridepublic void run() {JOptionPane.showMessageDialog(null, icon, "icon", JOptionPane.INFORMATION_MESSAGE);}diff --git a/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices3Test.java b/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices3Test.javaindex c2c6ee8cd2..ea0b2ab4b7 100644--- a/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices3Test.java+++ b/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices3Test.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.@@ -262,6 +262,7 @@ public class FunctionGraphGroupVertices3Test extends AbstractFunctionGraphTest {// Private Methods//==================================================================================================+ @Overrideprotected void doTestAddingToGroup() {FGData graphData = graphFunction("01002cf5");FunctionGraph functionGraph = graphData.getFunctionGraph();@@ -319,6 +320,7 @@ public class FunctionGraphGroupVertices3Test extends AbstractFunctionGraphTest {assertSelected(ungroupedVertices);}+ @Overrideprotected void doTestGroupingProperlyTranslatesEdgesFromGroupedVerticesToRealVertices() {//// WARNING!!! WARNING!!! WARNING!!! WARNING!!! WARNING!!! WARNING!!!diff --git a/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/GhidraGoPlugin.java b/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/GhidraGoPlugin.javaindex dff030734b..da8a6f685d 100644--- a/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/GhidraGoPlugin.java+++ b/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/GhidraGoPlugin.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.@@ -88,6 +88,7 @@ public class GhidraGoPlugin extends Plugin implements ApplicationLevelOnlyPlugin* @param url a {@link GhidraURL}* @return true if handled successfully, false otherwise.*/+ @Overridepublic boolean accept(URL url) {Msg.info(this, "GhidraGo accepting the resource at " + GhidraURL.getProjectURL(url));FrontEndTool frontEndTool = AppInfo.getFrontEndTool();diff --git a/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/ipc/CheckForFileProcessedRunnable.java b/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/ipc/CheckForFileProcessedRunnable.javaindex 01d39e44e1..38a21eab32 100644--- a/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/ipc/CheckForFileProcessedRunnable.java+++ b/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/ipc/CheckForFileProcessedRunnable.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.@@ -61,6 +61,7 @@ public class CheckForFileProcessedRunnable extends CheckPeriodicallyRunnable {this.filePath = filePath;}+ @Overridepublic void run() {try {if (checkCondition.call()) {@@ -113,6 +114,7 @@ public class CheckForFileProcessedRunnable extends CheckPeriodicallyRunnable {}}+ @Overridepublic void awaitTermination() throws StopWaitingException {try {executor.awaitTermination(MAX_WAIT_FOR_PROCESSING_MIN, TimeUnit.MINUTES);diff --git a/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/ipc/CheckForListenerRunnable.java b/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/ipc/CheckForListenerRunnable.javaindex 4421ff8a6b..4bd71d4165 100644--- a/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/ipc/CheckForListenerRunnable.java+++ b/Ghidra/Features/GhidraGo/src/main/java/ghidra/app/plugin/core/go/ipc/CheckForListenerRunnable.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.@@ -55,6 +55,7 @@ public class CheckForListenerRunnable extends CheckPeriodicallyRunnable {this.process = p;}+ @Overridepublic void run() {try {if (checkCondition.call()) {diff --git a/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/mouse/JgtEdgeNavigationPlugin.java b/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/mouse/JgtEdgeNavigationPlugin.javaindex 03c0942f43..78edc90aa6 100644--- a/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/mouse/JgtEdgeNavigationPlugin.java+++ b/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/mouse/JgtEdgeNavigationPlugin.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.@@ -43,6 +43,7 @@ public class JgtEdgeNavigationPlugin<V, E> extends AbstractJgtGraphMousePlugin<Vprotected int singleSelectionMask;+ @Overridepublic boolean checkModifiers(MouseEvent e) {return e.getModifiersEx() == singleSelectionMask;}diff --git a/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/mouse/JgtTranslatingPlugin.java b/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/mouse/JgtTranslatingPlugin.javaindex 56e3e99ac8..2144e204e1 100644--- a/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/mouse/JgtTranslatingPlugin.java+++ b/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/mouse/JgtTranslatingPlugin.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.@@ -51,6 +51,7 @@ public class JgtTranslatingPlugin<V, E>this.cursor = Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR);}+ @Overridepublic boolean checkModifiers(MouseEvent e) {return e.getModifiersEx() == translatingMask;}diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDManagedProperty.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDManagedProperty.javaindex ea08d67272..07af05d86d 100644--- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDManagedProperty.java+++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDManagedProperty.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.@@ -31,6 +31,7 @@ public class MDManagedProperty extends MDParsableItem {super(dmang);}+ @Overrideprotected void parseInternal() {// Do nothing}diff --git a/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/DiffServiceProvider.java b/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/DiffServiceProvider.javaindex 7f5fa50f3d..42fac7689f 100644--- a/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/DiffServiceProvider.java+++ b/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/DiffServiceProvider.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -36,10 +35,12 @@ public class DiffServiceProvider implements ServiceProvider {this.diffGoToService = new DiffGoToService(goToService, programDiffPlugin);}+ @Overridepublic void addServiceListener(ServiceListener listener) {serviceProvider.addServiceListener(listener);}+ @Overridepublic <T> T getService(Class<T> serviceClass) {if (serviceClass == ProgramManager.class) {return serviceClass.cast( diffProgramManager );@@ -50,6 +51,7 @@ public class DiffServiceProvider implements ServiceProvider {return serviceProvider.getService(serviceClass);}+ @Overridepublic void removeServiceListener(ServiceListener listener) {serviceProvider.removeServiceListener(listener);}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/AceRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/AceRecognizer.javaindex 3147cb8617..293f7d5b51 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/AceRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/AceRecognizer.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.@@ -16,7 +16,8 @@package ghidra.app.util.recognizer;public class AceRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x2a &&bytes[1] == (byte) 0x2a &&@@ -31,11 +32,13 @@ public class AceRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 7;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ArjRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ArjRecognizer.javaindex 07feaf2cd4..ce8820d914 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ArjRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ArjRecognizer.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.@@ -16,7 +16,8 @@package ghidra.app.util.recognizer;public class ArjRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x60 &&bytes[1] == (byte) 0xea) {@@ -26,11 +27,13 @@ public class ArjRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 2;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/Bzip2Recognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/Bzip2Recognizer.javaindex 9e4079a1fb..8ca998d391 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/Bzip2Recognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/Bzip2Recognizer.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.@@ -18,7 +18,8 @@ package ghidra.app.util.recognizer;public class Bzip2Recognizer implements Recognizer {public static final int MAGIC_BYTES = 0x5a42;- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x42 &&bytes[1] == (byte) 0x5a &&@@ -29,11 +30,13 @@ public class Bzip2Recognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 3;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CHMRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CHMRecognizer.javaindex 0b21e928d9..8f65b4b07a 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CHMRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CHMRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class CHMRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x49 &&bytes[1] == (byte) 0x54 &&@@ -29,11 +29,13 @@ public class CHMRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CabarcRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CabarcRecognizer.javaindex b9347c0f42..e9e81878c1 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CabarcRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CabarcRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class CabarcRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x4d &&bytes[1] == (byte) 0x53 &&@@ -29,11 +29,13 @@ public class CabarcRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CompressiaRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CompressiaRecognizer.javaindex 6e1ac41c00..2970cf9e10 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CompressiaRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CompressiaRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class CompressiaRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x43 &&bytes[1] == (byte) 0x4d &&@@ -33,11 +33,13 @@ public class CompressiaRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 8;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CramFSRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CramFSRecognizer.javaindex 8ed2c2ed3d..581eb4aae4 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CramFSRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/CramFSRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class CramFSRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x45 &&bytes[1] == (byte) 0x3d &&@@ -29,11 +29,13 @@ public class CramFSRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/DebRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/DebRecognizer.javaindex 6b6eb3bbbd..17686d0a39 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/DebRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/DebRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class DebRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x21 &&bytes[1] == (byte) 0x0a &&@@ -33,11 +33,13 @@ public class DebRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 8;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/DmgRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/DmgRecognizer.javaindex 31e6f82fb7..83bd0bad1a 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/DmgRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/DmgRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class DmgRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x47 &&bytes[1] == (byte) 0x4d &&@@ -29,11 +29,13 @@ public class DmgRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/EmptyPkzipRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/EmptyPkzipRecognizer.javaindex ee9b3f2622..b44e525654 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/EmptyPkzipRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/EmptyPkzipRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class EmptyPkzipRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x50 &&bytes[1] == (byte) 0x4b &&@@ -29,11 +29,13 @@ public class EmptyPkzipRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/FreezeRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/FreezeRecognizer.javaindex b89f01712f..02a01183b1 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/FreezeRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/FreezeRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class FreezeRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x1f &&bytes[1] == (byte) 0x9e) {@@ -27,11 +27,13 @@ public class FreezeRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 2;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/GzipRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/GzipRecognizer.javaindex e6701809b7..416c2486ba 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/GzipRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/GzipRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class GzipRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x1f &&bytes[1] == (byte) 0x8b) {@@ -27,11 +27,13 @@ public class GzipRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 2;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ISO9660Recognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ISO9660Recognizer.javaindex a995624046..fecfbb18a7 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ISO9660Recognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ISO9660Recognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class ISO9660Recognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= 32774) {if (bytes[32769] == (byte) 0x43 &&bytes[32770] == (byte) 0x44 &&@@ -48,11 +48,13 @@ public class ISO9660Recognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 36870;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ImpRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ImpRecognizer.javaindex b8159dfe7c..fd437b0d9a 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ImpRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ImpRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class ImpRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x49 &&bytes[1] == (byte) 0x4d &&@@ -29,11 +29,13 @@ public class ImpRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/JarRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/JarRecognizer.javaindex d9ed44b52e..fe0b1f357b 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/JarRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/JarRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class JarRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x50 &&bytes[1] == (byte) 0x4b &&@@ -29,11 +29,13 @@ public class JarRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/LhaRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/LhaRecognizer.javaindex 3ff4c0fd59..38e24658ba 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/LhaRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/LhaRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class LhaRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[2] == (byte) 0x2d &&bytes[3] == (byte) 0x6c &&@@ -28,11 +28,13 @@ public class LhaRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 5;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/MSWIMRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/MSWIMRecognizer.javaindex 9abfdb750f..aaea3d0215 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/MSWIMRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/MSWIMRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class MSWIMRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x4d &&bytes[1] == (byte) 0x53 &&@@ -32,11 +32,13 @@ public class MSWIMRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 7;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/MacromediaFlashRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/MacromediaFlashRecognizer.javaindex 0f3f5b81c9..9d81c497ed 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/MacromediaFlashRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/MacromediaFlashRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class MacromediaFlashRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x43 &&bytes[1] == (byte) 0x57 &&@@ -28,11 +28,13 @@ public class MacromediaFlashRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 3;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PakArcRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PakArcRecognizer.javaindex fa8f0b9e5c..2068253da3 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PakArcRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PakArcRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class PakArcRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x1a &&(bytes[1] & 0xf0) == (byte) 0x00 ) {@@ -27,11 +27,13 @@ public class PakArcRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 2;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PkzipRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PkzipRecognizer.javaindex b072b95c87..58fd9023ae 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PkzipRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PkzipRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class PkzipRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x50 &&bytes[1] == (byte) 0x4b &&@@ -29,11 +29,13 @@ public class PkzipRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PpmdRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PpmdRecognizer.javaindex 769345f419..e353e4f835 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PpmdRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/PpmdRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class PpmdRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x8f &&bytes[1] == (byte) 0xaf &&@@ -29,11 +29,13 @@ public class PpmdRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/RPMRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/RPMRecognizer.javaindex 0b9beb3dff..5badc593a1 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/RPMRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/RPMRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class RPMRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0xed &&bytes[1] == (byte) 0xab &&@@ -29,11 +29,13 @@ public class RPMRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/RarRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/RarRecognizer.javaindex 4265b3de06..0078c0853b 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/RarRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/RarRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class RarRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x52 &&bytes[1] == (byte) 0x61 &&@@ -29,11 +29,13 @@ public class RarRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SbcRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SbcRecognizer.javaindex 603f19388c..81fd6c7e7a 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SbcRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SbcRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class SbcRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x53 &&bytes[1] == (byte) 0x42 &&@@ -29,11 +29,13 @@ public class SbcRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SbxRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SbxRecognizer.javaindex c99c2fe5e6..990860f0f5 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SbxRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SbxRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class SbxRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x53 &&bytes[1] == (byte) 0x42 &&@@ -29,11 +29,13 @@ public class SbxRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SevenZipRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SevenZipRecognizer.javaindex 24217a600c..aac7f948c3 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SevenZipRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SevenZipRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class SevenZipRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x37 &&bytes[1] == (byte) 0x7a &&@@ -31,11 +31,13 @@ public class SevenZipRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 6;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SpannedPkzipRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SpannedPkzipRecognizer.javaindex 7c9ca7a756..ae16a4c2e9 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SpannedPkzipRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SpannedPkzipRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class SpannedPkzipRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x50 &&bytes[1] == (byte) 0x4b &&@@ -29,11 +29,13 @@ public class SpannedPkzipRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SqzRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SqzRecognizer.javaindex 1c4a0e66b8..070a25e35f 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SqzRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SqzRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class SqzRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x48 &&bytes[1] == (byte) 0x4c &&@@ -31,11 +31,13 @@ public class SqzRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 6;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/StuffIt1Recognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/StuffIt1Recognizer.javaindex e85efea9a2..b4509f206e 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/StuffIt1Recognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/StuffIt1Recognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class StuffIt1Recognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x53 &&bytes[1] == (byte) 0x49 &&@@ -29,11 +29,13 @@ public class StuffIt1Recognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/StuffIt5Recognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/StuffIt5Recognizer.javaindex 53a0ea30ef..87190b27bb 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/StuffIt5Recognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/StuffIt5Recognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class StuffIt5Recognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x53 &&bytes[1] == (byte) 0x74 &&@@ -33,11 +33,13 @@ public class StuffIt5Recognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 8;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SzipRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SzipRecognizer.javaindex ef47d27823..1728680987 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SzipRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/SzipRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class SzipRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x53 &&bytes[1] == (byte) 0x5a &&@@ -29,11 +29,13 @@ public class SzipRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/TarRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/TarRecognizer.javaindex 37c10a1f18..d2d32be12d 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/TarRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/TarRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class TarRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[257] == (byte) 0x75 &&bytes[258] == (byte) 0x73 &&@@ -31,11 +31,13 @@ public class TarRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 263;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UharcRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UharcRecognizer.javaindex ddd47e59fb..85a3593b14 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UharcRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UharcRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class UharcRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if ((bytes[0] == (byte) 0x55) &&(bytes[1] == (byte) 0x48) &&@@ -29,11 +29,13 @@ public class UharcRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UnixCompressRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UnixCompressRecognizer.javaindex bdecc31987..a4c78a6e22 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UnixCompressRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UnixCompressRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class UnixCompressRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x1f &&bytes[1] == (byte) 0x9d) {@@ -27,11 +27,13 @@ public class UnixCompressRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 2;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UnixPackRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UnixPackRecognizer.javaindex c8892058a0..bc3d5daf30 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UnixPackRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/UnixPackRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class UnixPackRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x1f &&bytes[1] == (byte) 0x1e &&@@ -28,11 +28,13 @@ public class UnixPackRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 3;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/VHDRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/VHDRecognizer.javaindex e2eeec0972..bbff9541e9 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/VHDRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/VHDRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class VHDRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x63 &&bytes[1] == (byte) 0x6f &&@@ -33,11 +33,13 @@ public class VHDRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 8;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/XZRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/XZRecognizer.javaindex a0cc8bb2e2..9c6b1de388 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/XZRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/XZRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class XZRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0xfd &&bytes[1] == (byte) 0x37 &&@@ -31,11 +31,13 @@ public class XZRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 6;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/XarRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/XarRecognizer.javaindex ab6d53683e..fa1e69571e 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/XarRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/XarRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class XarRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x78 &&bytes[1] == (byte) 0x61 &&@@ -29,11 +29,13 @@ public class XarRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/YbsRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/YbsRecognizer.javaindex 7d9c1befc4..976e625474 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/YbsRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/YbsRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class YbsRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x59 &&bytes[1] == (byte) 0x42 &&@@ -29,11 +29,13 @@ public class YbsRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 4;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ZlibRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ZlibRecognizer.javaindex ec82db7f79..3a5c2e9787 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ZlibRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/ZlibRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class ZlibRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if (bytes[0] == (byte) 0x78) {return "File appears to be a ZLIB compressed file";@@ -26,11 +26,13 @@ public class ZlibRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 1;}}diff --git a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/sitxRecognizer.java b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/sitxRecognizer.javaindex 2a15596f00..667b0c7a1a 100644--- a/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/sitxRecognizer.java+++ b/Ghidra/Features/Recognizers/src/main/java/ghidra/app/util/recognizer/sitxRecognizer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -17,7 +16,8 @@package ghidra.app.util.recognizer;public class sitxRecognizer implements Recognizer {- public String recognize(byte[] bytes) {+ @Override+ public String recognize(byte[] bytes) {if (bytes.length >= numberOfBytesRequired()) {if ((bytes[0] == (byte) 0x53 &&bytes[1] == (byte) 0x74 &&@@ -42,11 +42,13 @@ public class sitxRecognizer implements Recognizer {return null;}- public int getPriority() {+ @Override+ public int getPriority() {return 100;}- public int numberOfBytesRequired() {+ @Override+ public int numberOfBytesRequired() {return 8;}}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/data/ExtIsfDataTypeWriter.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/data/ExtIsfDataTypeWriter.javaindex 800ae08147..6ff2d0f4c9 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/data/ExtIsfDataTypeWriter.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/data/ExtIsfDataTypeWriter.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.@@ -52,6 +52,7 @@ public class ExtIsfDataTypeWriter extends IsfDataTypeWriter {STRICT = false;}+ @Overridepublic JsonObject getRootObject(TaskMonitor monitor) throws CancelledException, IOException {genRoot(monitor);return root;@@ -133,6 +134,7 @@ public class ExtIsfDataTypeWriter extends IsfDataTypeWriter {return new ExtIsfTypedefPointer(typeDef);}+ @Overridepublic IsfObject newTypedefUser(TypeDef typeDef, IsfObject object) {return new ExtIsfTypedefUser(typeDef, object);}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/data/SarifDataTypeWriter.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/data/SarifDataTypeWriter.javaindex 9adaaf0fdd..80fa63c0b5 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/data/SarifDataTypeWriter.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/data/SarifDataTypeWriter.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.@@ -57,6 +57,7 @@ public class SarifDataTypeWriter extends ExtIsfDataTypeWriter {return jobj;}+ @Overridepublic JsonArray getResults() {return types;}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifClassesNamespaceWriter.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifClassesNamespaceWriter.javaindex 688691a108..324fcc90b6 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifClassesNamespaceWriter.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifClassesNamespaceWriter.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.@@ -89,6 +89,7 @@ public class SarifClassesNamespaceWriter extends AbstractExtWriter {}}+ @Overridepublic JsonArray getResults() {return objects;}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifExternalLibraryWriter.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifExternalLibraryWriter.javaindex 52aa70e5fd..7e902e05ab 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifExternalLibraryWriter.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifExternalLibraryWriter.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.@@ -72,6 +72,7 @@ public class SarifExternalLibraryWriter extends AbstractExtWriter {}}+ @Overridepublic JsonArray getResults() {return objects;}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/func/SarifFunctionWriter.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/func/SarifFunctionWriter.javaindex 6542b66bbc..33ec4601e0 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/func/SarifFunctionWriter.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/func/SarifFunctionWriter.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.@@ -78,6 +78,7 @@ public class SarifFunctionWriter extends AbstractExtWriter {objects.add(getTree(sarif));}+ @Overridepublic JsonArray getResults() {return objects;}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateRefWriter.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateRefWriter.javaindex 6a7534d2d7..7b97c0f7aa 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateRefWriter.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateRefWriter.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.@@ -74,6 +74,7 @@ public class SarifEquateRefWriter extends AbstractExtWriter {}}+ @Overridepublic JsonArray getResults() {return objects;}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateWriter.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateWriter.javaindex a5f1dbbdce..0c45cd8c94 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateWriter.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateWriter.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.@@ -74,6 +74,7 @@ public class SarifEquateWriter extends AbstractExtWriter {}}+ @Overridepublic JsonArray getResults() {return objects;}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifReferenceWriter.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifReferenceWriter.javaindex f6b5bd457d..63a6f5dba0 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifReferenceWriter.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifReferenceWriter.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.@@ -107,6 +107,7 @@ public class SarifReferenceWriter extends AbstractExtWriter {}}+ @Overridepublic JsonArray getResults() {return objects;}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/symbols/SarifSymbolWriter.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/symbols/SarifSymbolWriter.javaindex b9960545f5..b044c58e36 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/symbols/SarifSymbolWriter.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/symbols/SarifSymbolWriter.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.@@ -73,6 +73,7 @@ public class SarifSymbolWriter extends AbstractExtWriter {objects.add(getTree(sarif));}+ @Overridepublic JsonArray getResults() {return objects;}diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifProgramResultHandler.java b/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifProgramResultHandler.javaindex 0292c3c22f..40d9eeebda 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifProgramResultHandler.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifProgramResultHandler.java@@ -87,6 +87,7 @@ public class SarifProgramResultHandler extends SarifResultHandler {programMgr.addManagers();}+ @Overrideprotected void doRun(TaskMonitor monitor) {int[] selected = provider.filterTable.getTable().getSelectedRows();Map<String, List<Map<String, Object>>> results = new HashMap<>();diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/io/SarifGsonIO.java b/Ghidra/Features/Sarif/src/main/java/sarif/io/SarifGsonIO.javaindex 9f59efe4fb..5d022e83eb 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/io/SarifGsonIO.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/io/SarifGsonIO.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.@@ -25,11 +25,13 @@ import com.google.gson.JsonSyntaxException;public class SarifGsonIO implements SarifIO {+ @Overridepublic SarifSchema210 readSarif(File file) throws JsonSyntaxException, IOException {Gson gson = new Gson();return gson.fromJson(Files.readString(file.toPath()), SarifSchema210.class);}+ @Overridepublic SarifSchema210 readSarif(String str) throws JsonSyntaxException, IOException {Gson gson = new Gson();return gson.fromJson(str, SarifSchema210.class);diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/io/SarifJacksonIO.java b/Ghidra/Features/Sarif/src/main/java/sarif/io/SarifJacksonIO.javaindex f0c4f68c48..ec10bdb3ed 100644--- a/Ghidra/Features/Sarif/src/main/java/sarif/io/SarifJacksonIO.java+++ b/Ghidra/Features/Sarif/src/main/java/sarif/io/SarifJacksonIO.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.@@ -23,12 +23,14 @@ import com.google.gson.JsonSyntaxException;public class SarifJacksonIO implements SarifIO {+ @Overridepublic SarifSchema210 readSarif(File file) throws JsonSyntaxException, IOException {// ObjectMapper mapper = new ObjectMapper();// return mapper.readValue(Files.readString(file.toPath()), SarifSchema210.class);throw new IOException("Jackson not currently supported");}+ @Overridepublic SarifSchema210 readSarif(String str) throws JsonSyntaxException, IOException {// ObjectMapper mapper = new ObjectMapper();// return mapper.readValue(str, SarifSchema210.class);diff --git a/Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcOverlaySarifTest.java b/Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcOverlaySarifTest.javaindex 87ea4ca2c6..b564bd921e 100644--- a/Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcOverlaySarifTest.java+++ b/Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcOverlaySarifTest.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.@@ -47,6 +47,7 @@ public class MergeCalcOverlaySarifTest extends AbstractSarifTest {assert(differences.isEmpty());}+ @Overrideprotected Program getProgram(String progName) throws Exception {return buildOverlayCalcExeProgram();}diff --git a/Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcSarifTest.java b/Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcSarifTest.javaindex 6bd76dac90..99454b30f9 100644--- a/Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcSarifTest.java+++ b/Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcSarifTest.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.@@ -47,6 +47,7 @@ public class MergeCalcSarifTest extends AbstractSarifTest {assert(differences.isEmpty());}+ @Overrideprotected Program getProgram(String progName) throws Exception {return buildCalcExeProgram();}diff --git a/Ghidra/Features/Sarif/src/test/java/sarif/MergeMipsSarifTest.java b/Ghidra/Features/Sarif/src/test/java/sarif/MergeMipsSarifTest.javaindex a49de87487..40a1981306 100644--- a/Ghidra/Features/Sarif/src/test/java/sarif/MergeMipsSarifTest.java+++ b/Ghidra/Features/Sarif/src/test/java/sarif/MergeMipsSarifTest.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.@@ -47,10 +47,12 @@ public class MergeMipsSarifTest extends AbstractSarifTest {assert(differences.isEmpty());}+ @Overrideprotected Program getProgram(String progName) throws Exception {return buildR4000Program();}+ @Overridepublic void reset() throws Exception {if (program != null) {if (txIdOut != -1) {diff --git a/Ghidra/Features/Sarif/src/test/java/sarif/MergeNotepadSarifTest.java b/Ghidra/Features/Sarif/src/test/java/sarif/MergeNotepadSarifTest.javaindex 5c0a87e53f..ff97de6557 100644--- a/Ghidra/Features/Sarif/src/test/java/sarif/MergeNotepadSarifTest.java+++ b/Ghidra/Features/Sarif/src/test/java/sarif/MergeNotepadSarifTest.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.@@ -58,6 +58,7 @@ public class MergeNotepadSarifTest extends AbstractSarifTest {assert(differences.isEmpty());}+ @Overrideprotected Program getProgram(String progName) throws Exception {return buildNotepadMergeListingTest_X86Program();}diff --git a/Ghidra/Features/Sarif/src/test/java/sarif/MergeWallaceSarifTest.java b/Ghidra/Features/Sarif/src/test/java/sarif/MergeWallaceSarifTest.javaindex 26b861ce5b..2735955a0d 100644--- a/Ghidra/Features/Sarif/src/test/java/sarif/MergeWallaceSarifTest.java+++ b/Ghidra/Features/Sarif/src/test/java/sarif/MergeWallaceSarifTest.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.@@ -55,6 +55,7 @@ public class MergeWallaceSarifTest extends AbstractSarifTest {assert(differences.isEmpty());}+ @Overrideprotected Program getProgram(String progName) throws Exception {return buildWallaceSrcProgram();}diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ImpliedMatchProgramCorrelator.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ImpliedMatchProgramCorrelator.javaindex 75fe5d83fc..4daeb357fb 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ImpliedMatchProgramCorrelator.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ImpliedMatchProgramCorrelator.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.@@ -38,6 +38,7 @@ public class ImpliedMatchProgramCorrelator extends VTAbstractProgramCorrelator {// Do Nothing}+ @Overridepublic String getName() {return NAME;}diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ManualMatchProgramCorrelator.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ManualMatchProgramCorrelator.javaindex d3e13804fe..9776879c7c 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ManualMatchProgramCorrelator.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ManualMatchProgramCorrelator.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.@@ -38,6 +38,7 @@ public class ManualMatchProgramCorrelator extends VTAbstractProgramCorrelator {// Do Nothing}+ @Overridepublic String getName() {return NAME;}diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchTagDB.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchTagDB.javaindex a0adfa7afa..ef107ce293 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchTagDB.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchTagDB.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.@@ -83,6 +83,7 @@ public class VTMatchTagDB extends DatabaseObject implements VTMatchTag {return record.getString(TAG_NAME_COL.column());}+ @Overridepublic int compareTo(VTMatchTag otherTag) {return getName().compareTo(otherTag.getName());}diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/impl/MarkupItemStorageImpl.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/impl/MarkupItemStorageImpl.javaindex 86f7e0ec5a..47707fccd7 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/impl/MarkupItemStorageImpl.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/impl/MarkupItemStorageImpl.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -90,6 +89,7 @@ public class MarkupItemStorageImpl implements MarkupItemStorage {return statusDescription;}+ @Overridepublic Stringable getSourceValue() {return sourceValue;}diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/impl/VTRelatedMatchImpl.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/impl/VTRelatedMatchImpl.javaindex c358a2a20b..e21c34ffd3 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/impl/VTRelatedMatchImpl.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/impl/VTRelatedMatchImpl.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -55,23 +54,28 @@ public class VTRelatedMatchImpl implements VTRelatedMatch {this.sourceFunction = sourceFunction;}- public VTRelatedMatchType getCorrelation() {+ @Override+ public VTRelatedMatchType getCorrelation() {return correlation;}- public Address getDestinationAddress() {+ @Override+ public Address getDestinationAddress() {return destinationAddress;}- public Function getDestinationFunction() {+ @Override+ public Function getDestinationFunction() {return destinationFunction;}- public Address getSourceAddress() {+ @Override+ public Address getSourceAddress() {return sourceAddress;}- public Function getSourceFunction() {+ @Override+ public Function getSourceFunction() {return sourceFunction;}}diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/main/VTMatchTag.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/main/VTMatchTag.javaindex 993ac020f4..eded5fd6f2 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/main/VTMatchTag.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/main/VTMatchTag.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -32,6 +31,7 @@ public interface VTMatchTag extends Comparable<VTMatchTag> {return "<Not Tagged>";}+ @Overridepublic int compareTo(VTMatchTag o) {return getName().compareTo(o.getName());}diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/actions/ProviderToggleAction.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/actions/ProviderToggleAction.javaindex d123a09a55..c9ebae78c3 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/actions/ProviderToggleAction.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/actions/ProviderToggleAction.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -46,7 +45,8 @@ public class ProviderToggleAction extends ToggleDockingAction {JComponent component = provider.getComponent();component.addHierarchyListener( new HierarchyListener() {- public void hierarchyChanged( HierarchyEvent e ) {+ @Override+ public void hierarchyChanged( HierarchyEvent e ) {long changeFlags = e.getChangeFlags();if ( HierarchyEvent.SHOWING_CHANGED ==(changeFlags & HierarchyEvent.SHOWING_CHANGED) ) {diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/editors/DisplayableOffset.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/editors/DisplayableOffset.javaindex c3dea737e8..3ee4ebef89 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/editors/DisplayableOffset.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/editors/DisplayableOffset.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -26,6 +25,7 @@ public interface DisplayableOffset extends DisplayStringProvider, Comparable<Dispublic static String NO_OFFSET = "No Offset";+ @Overridepublic String getDisplayString();public Address getAddress();diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/impliedmatches/MatchStatusUpdaterAssociationHook.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/impliedmatches/MatchStatusUpdaterAssociationHook.javaindex b8cf7cb128..8b93218c39 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/impliedmatches/MatchStatusUpdaterAssociationHook.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/impliedmatches/MatchStatusUpdaterAssociationHook.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.@@ -54,6 +54,7 @@ public class MatchStatusUpdaterAssociationHook implements AssociationHook, VTConupdateMarkupStatus(markupItem.getAssociation());}+ @Overridepublic void sessionChanged(VTSession newSession) {setSession(newSession);}diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableListingAddress.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableListingAddress.javaindex c7f17ad210..ac36d03be1 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableListingAddress.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableListingAddress.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.@@ -30,6 +30,7 @@ public class DisplayableListingAddress implements DisplayableAddress {this.address = listingAddress;}+ @Overridepublic Program getProgram() {return program;}diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableListingOffset.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableListingOffset.javaindex cf5b36b97d..bec23da490 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableListingOffset.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableListingOffset.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -57,14 +56,17 @@ public class DisplayableListingOffset implements DisplayableOffset {return address;}+ @Overridepublic long getOffset() {return offset;}+ @Overridepublic BigInteger getOffsetAsBigInteger() {return offsetAsBigInteger;}+ @Overridepublic String getDisplayString() {if (address == null || address == Address.NO_ADDRESS) {return NO_OFFSET;diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableVariableOffset.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableVariableOffset.javaindex cd374702af..cf416a9337 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableVariableOffset.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/DisplayableVariableOffset.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -42,14 +41,17 @@ public class DisplayableVariableOffset implements DisplayableOffset {return parameterAddress;}+ @Overridepublic long getOffset() {return offset;}+ @Overridepublic BigInteger getOffsetAsBigInteger() {return offsetAsBigInteger;}+ @Overridepublic String getDisplayString() {if (parameterAddress == null || parameterAddress == Address.NO_ADDRESS) {return NO_OFFSET;diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/FilterIconFlashTimer.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/FilterIconFlashTimer.javaindex fdc1b8f995..f8f67a4af8 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/FilterIconFlashTimer.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/FilterIconFlashTimer.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.@@ -47,6 +47,7 @@ public class FilterIconFlashTimer<T> extends Timer implements ActionListener {addActionListener(this);}+ @Overridepublic void actionPerformed(ActionEvent event) {if (!filterDialog.isFiltered()) {stop();diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/validator/VTPreconditionValidator.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/validator/VTPreconditionValidator.javaindex 50763387ac..d123eefc9b 100644--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/validator/VTPreconditionValidator.java+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/validator/VTPreconditionValidator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -45,6 +44,7 @@ public abstract class VTPreconditionValidator implements ConditionTester, Extensreturn getName();}+ @Overridepublic final ConditionResult run(TaskMonitor monitor) throws CancelledException {// make sure the program isn't closed while we are workingdiff --git a/Ghidra/Framework/DB/src/main/java/db/ConvertedRecordIterator.java b/Ghidra/Framework/DB/src/main/java/db/ConvertedRecordIterator.javaindex a2ce328435..add7c0dd05 100644--- a/Ghidra/Framework/DB/src/main/java/db/ConvertedRecordIterator.java+++ b/Ghidra/Framework/DB/src/main/java/db/ConvertedRecordIterator.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.@@ -41,6 +41,7 @@ public abstract class ConvertedRecordIterator implements RecordIterator {/*** @see db.RecordIterator#delete()*/+ @Overridepublic boolean delete() throws IOException {if (!deleteAllowed) {throw new UnsupportedOperationException("record delete not allowed");@@ -51,6 +52,7 @@ public abstract class ConvertedRecordIterator implements RecordIterator {/*** @see db.RecordIterator#hasNext()*/+ @Overridepublic boolean hasNext() throws IOException {return originalIterator.hasNext();}@@ -58,6 +60,7 @@ public abstract class ConvertedRecordIterator implements RecordIterator {/*** @see db.RecordIterator#hasPrevious()*/+ @Overridepublic boolean hasPrevious() throws IOException {return originalIterator.hasPrevious();}@@ -65,6 +68,7 @@ public abstract class ConvertedRecordIterator implements RecordIterator {/*** @see db.RecordIterator#next()*/+ @Overridepublic DBRecord next() throws IOException {return convertRecord(originalIterator.next());}@@ -72,6 +76,7 @@ public abstract class ConvertedRecordIterator implements RecordIterator {/*** @see db.RecordIterator#previous()*/+ @Overridepublic DBRecord previous() throws IOException {return convertRecord(originalIterator.previous());}diff --git a/Ghidra/Framework/DB/src/main/java/db/DBInitializer.java b/Ghidra/Framework/DB/src/main/java/db/DBInitializer.javaindex 691fee11ea..1550cb4e7a 100644--- a/Ghidra/Framework/DB/src/main/java/db/DBInitializer.java+++ b/Ghidra/Framework/DB/src/main/java/db/DBInitializer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -20,7 +19,8 @@ import ghidra.framework.ModuleInitializer;import db.buffers.BufferMgr;public class DBInitializer implements ModuleInitializer {- public void run() {+ @Override+ public void run() {BufferMgr.cleanupOldCacheFiles();diff --git a/Ghidra/Framework/DB/src/test/java/db/buffers/DummyBufferFileMgr.java b/Ghidra/Framework/DB/src/test/java/db/buffers/DummyBufferFileMgr.javaindex e31389705a..95fe217d16 100644--- a/Ghidra/Framework/DB/src/test/java/db/buffers/DummyBufferFileMgr.java+++ b/Ghidra/Framework/DB/src/test/java/db/buffers/DummyBufferFileMgr.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.@@ -37,30 +37,37 @@ public class DummyBufferFileMgr implements BufferFileManager {this.enableChangeFiles = enableChangeFiles;}+ @Overridepublic int getCurrentVersion() {return cur;}+ @Overridepublic File getBufferFile(int version) {return new File(dir, name + version + ".bf" );}+ @Overridepublic File getVersionFile(int version) {if (enableVersionFiles) {return new File(dir, name + version + ".vf" );}return null;}+ @Overridepublic File getChangeDataFile(int version) {if (enableChangeFiles) {return new File(dir, name + version + ".cf" );}return null;}+ @Overridepublic File getChangeMapFile() {return null;}+ @Overridepublic void versionCreated(int version, String comment, long checkinId) {cur = version;}+ @Overridepublic void updateEnded(long checkinId) {}}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ComponentTransferable.java b/Ghidra/Framework/Docking/src/main/java/docking/ComponentTransferable.javaindex 6694cc8d3d..f750b5dc85 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentTransferable.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentTransferable.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.@@ -57,6 +57,7 @@ class ComponentTransferable implements Transferable, ClipboardOwner {/*** Return all data flavors that this class supports.*/+ @Overridepublic synchronized DataFlavor []getTransferDataFlavors() {return flavors;}@@ -64,6 +65,7 @@ class ComponentTransferable implements Transferable, ClipboardOwner {/*** Return whether the specifed data flavor is supported.*/+ @Overridepublic boolean isDataFlavorSupported(DataFlavor f) {return f == localComponentProviderFlavor;}@@ -71,6 +73,7 @@ class ComponentTransferable implements Transferable, ClipboardOwner {/*** Return the transfer data with the given data flavor.*/+ @Overridepublic synchronized Object getTransferData(DataFlavor f)throws UnsupportedFlavorException, IOException {@@ -91,6 +94,7 @@ class ComponentTransferable implements Transferable, ClipboardOwner {/*** ClipboardOwner interface method.*/+ @Overridepublic void lostOwnership(Clipboard clipboard, Transferable contents) {}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowsContextSensitiveHelpListener.java b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowsContextSensitiveHelpListener.javaindex 7f245255ca..ca731c7ce3 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowsContextSensitiveHelpListener.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowsContextSensitiveHelpListener.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -31,7 +30,8 @@ class DockingWindowsContextSensitiveHelpListener {private DockingWindowsContextSensitiveHelpListener() {Toolkit toolkit = Toolkit.getDefaultToolkit();AWTEventListener listener = new AWTEventListener() {- public void eventDispatched( AWTEvent event ) {+ @Override+ public void eventDispatched( AWTEvent event ) {DockingWindowManager.setMouseOverObject( event.getSource() );}};diff --git a/Ghidra/Framework/Docking/src/main/java/docking/dnd/DragDropTreeTransferable.java b/Ghidra/Framework/Docking/src/main/java/docking/dnd/DragDropTreeTransferable.javaindex c4b93e2720..cbd1439bbc 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/dnd/DragDropTreeTransferable.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/dnd/DragDropTreeTransferable.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -66,7 +65,8 @@ public class DragDropTreeTransferable implements Transferable, ClipboardOwner {/*** Return all data flavors that this class supports.*/- public synchronized DataFlavor []getTransferDataFlavors() {+ @Override+ public synchronized DataFlavor []getTransferDataFlavors() {return flavors;}@@ -74,7 +74,8 @@ public class DragDropTreeTransferable implements Transferable, ClipboardOwner {* Return whether the specifed data flavor is supported.* @param f the DataFlavor to check if supported.*/- public boolean isDataFlavorSupported(DataFlavor f) {+ @Override+ public boolean isDataFlavorSupported(DataFlavor f) {return flavorList.contains(f);}@@ -82,7 +83,8 @@ public class DragDropTreeTransferable implements Transferable, ClipboardOwner {* Return the transfer data with the given data flavor.* @param f the DataFlavor for which to get a Transferable.*/- public synchronized Object getTransferData(DataFlavor f)+ @Override+ public synchronized Object getTransferData(DataFlavor f)throws UnsupportedFlavorException, IOException {if (f.equals(localTreeNodeFlavor)) {@@ -105,7 +107,8 @@ public class DragDropTreeTransferable implements Transferable, ClipboardOwner {* @param clipboard the system clipboard.* @param contents the Transferable lost in the clipboard.*/- public void lostOwnership(Clipboard clipboard, Transferable contents) {+ @Override+ public void lostOwnership(Clipboard clipboard, Transferable contents) {}}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/menu/InvertableImageIcon.java b/Ghidra/Framework/Docking/src/main/java/docking/menu/InvertableImageIcon.javaindex 4c441bab8a..8769311cd6 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/menu/InvertableImageIcon.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/menu/InvertableImageIcon.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -63,6 +62,7 @@ class InvertableImageIcon implements Icon {/*** @see javax.swing.Icon#getIconHeight()*/+ @Overridepublic int getIconHeight() {return icon.getIconHeight();}@@ -70,6 +70,7 @@ class InvertableImageIcon implements Icon {/*** @see javax.swing.Icon#getIconWidth()*/+ @Overridepublic int getIconWidth() {return icon.getIconWidth();}@@ -77,6 +78,7 @@ class InvertableImageIcon implements Icon {/*** @see javax.swing.Icon#paintIcon(java.awt.Component, java.awt.Graphics, int, int)*/+ @Overridepublic void paintIcon(Component c, Graphics g, int x, int y) {icon.paintIcon(c, g, x, y);}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/menu/MenuHandler.java b/Ghidra/Framework/Docking/src/main/java/docking/menu/MenuHandler.javaindex cb7d08dd76..bcd61e1515 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/menu/MenuHandler.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/menu/MenuHandler.java@@ -54,6 +54,7 @@ public abstract class MenuHandler implements MenuListener, PopupMenuListener {* Invoked when a menu is cancelled (not sure if this is ever invoked)* @see javax.swing.event.MenuListener#menuCanceled(javax.swing.event.MenuEvent)*/+ @Overridepublic void menuCanceled(MenuEvent e) {}@@ -63,6 +64,7 @@ public abstract class MenuHandler implements MenuListener, PopupMenuListener {* if an action item is selected.* @see javax.swing.event.MenuListener#menuDeselected(javax.swing.event.MenuEvent)*/+ @Overridepublic void menuDeselected(MenuEvent e) {}@@ -70,6 +72,7 @@ public abstract class MenuHandler implements MenuListener, PopupMenuListener {* Invoked when a menu is selected.* @see javax.swing.event.MenuListener#menuSelected(javax.swing.event.MenuEvent)*/+ @Overridepublic void menuSelected(MenuEvent e) {}@@ -77,7 +80,8 @@ public abstract class MenuHandler implements MenuListener, PopupMenuListener {* This method is called before the popup menu becomes visible* @see javax.swing.event.PopupMenuListener#popupMenuWillBecomeVisible(javax.swing.event.PopupMenuEvent)*/- public void popupMenuWillBecomeVisible(PopupMenuEvent e) {+ @Override+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {}/**@@ -85,14 +89,16 @@ public abstract class MenuHandler implements MenuListener, PopupMenuListener {* Note that a JPopupMenu can become invisible any time* @see javax.swing.event.PopupMenuListener#popupMenuWillBecomeInvisible(javax.swing.event.PopupMenuEvent)*/- public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {+ @Override+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}/*** This method is called when the popup menu is canceled* @see javax.swing.event.PopupMenuListener#popupMenuCanceled(javax.swing.event.PopupMenuEvent)*/- public void popupMenuCanceled(PopupMenuEvent e) {+ @Override+ public void popupMenuCanceled(PopupMenuEvent e) {}}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ColorSorter.java b/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ColorSorter.javaindex 02d65576f5..8dbe1638ef 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ColorSorter.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/theme/gui/ColorSorter.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.@@ -48,6 +48,7 @@ public enum ColorSorter implements Comparator<Color> {return name;}+ @Overridepublic String toString() {return name;}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/CursorBlinker.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/CursorBlinker.javaindex 490705bcf6..c0a82c14a3 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/CursorBlinker.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/CursorBlinker.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -39,6 +38,7 @@ public class CursorBlinker {this.fieldPanel = panel;timer = new Timer(500, new ActionListener() {+ @Overridepublic void actionPerformed(ActionEvent e) {if (paintBounds != null) {showCursor = !showCursor;diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/DefaultBackgroundColorModel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/DefaultBackgroundColorModel.javaindex 74098047eb..9b62836a95 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/DefaultBackgroundColorModel.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/DefaultBackgroundColorModel.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -32,12 +31,15 @@ public class DefaultBackgroundColorModel implements BackgroundColorModel {public Color getBackgroundColor(int index) {return backgroundColor;}+ @Overridepublic Color getBackgroundColor(BigInteger index) {return backgroundColor;}+ @Overridepublic Color getDefaultBackgroundColor() {return backgroundColor;}+ @Overridepublic void setDefaultBackgroundColor(Color color) {this.backgroundColor = color;}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/EmptyFieldBackgroundColorManager.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/EmptyFieldBackgroundColorManager.javaindex 78fab77002..d0b1e2e250 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/EmptyFieldBackgroundColorManager.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/EmptyFieldBackgroundColorManager.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -30,14 +29,17 @@ public class EmptyFieldBackgroundColorManager implements FieldBackgroundColorManprivate EmptyFieldBackgroundColorManager() {}+ @Overridepublic List<Highlight> getSelectionHighlights(int row) {return EMPTY_HIGHLIGHT_LIST;}+ @Overridepublic Color getBackgroundColor() {return null;}+ @Overridepublic Color getPaddingColor(int padIndex) {return null;}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/EmptyLayoutBackgroundColorManager.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/EmptyLayoutBackgroundColorManager.javaindex 1e319b6b78..c3e88e19d9 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/EmptyLayoutBackgroundColorManager.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/EmptyLayoutBackgroundColorManager.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -28,18 +27,22 @@ public class EmptyLayoutBackgroundColorManager implements LayoutBackgroundColorMthis.background = background;}+ @Overridepublic FieldBackgroundColorManager getFieldBackgroundColorManager(int fieldNum) {return EmptyFieldBackgroundColorManager.EMPTY_INSTANCE;}+ @Overridepublic Color getBackgroundColor() {return background;}+ @Overridepublic Color getPaddingColor(int gap) {return null;}+ @Overridepublic Color getBackgroundColor(FieldLocation location) {return background;}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/FullySelectedFieldBackgroundColorManager.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/FullySelectedFieldBackgroundColorManager.javaindex e311bf0113..4af3db3f97 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/FullySelectedFieldBackgroundColorManager.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/FullySelectedFieldBackgroundColorManager.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -28,14 +27,17 @@ public class FullySelectedFieldBackgroundColorManager implements FieldBackgroundthis.selectionColor = selectionColor;}+ @Overridepublic Color getBackgroundColor() {return selectionColor;}+ @Overridepublic List<Highlight> getSelectionHighlights(int row) {return EmptyFieldBackgroundColorManager.EMPTY_HIGHLIGHT_LIST;}+ @Overridepublic Color getPaddingColor(int padIndex) {return null;}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/LayoutBackgroundColorManagerAdapter.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/LayoutBackgroundColorManagerAdapter.javaindex 942cbf6539..c266388f31 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/LayoutBackgroundColorManagerAdapter.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/LayoutBackgroundColorManagerAdapter.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -30,10 +29,12 @@ public class LayoutBackgroundColorManagerAdapter implements LayoutBackgroundColopublic LayoutBackgroundColorManagerAdapter(LayoutBackgroundColorManager layoutColorMap) {this.layoutSelectionMap = layoutColorMap;}+ @Overridepublic Color getBackgroundColor() {return layoutSelectionMap.getBackgroundColor();}+ @Overridepublic FieldBackgroundColorManager getFieldBackgroundColorManager(int fieldNum) {return layoutSelectionMap.getFieldBackgroundColorManager(fieldNum+start);}@@ -42,6 +43,7 @@ public class LayoutBackgroundColorManagerAdapter implements LayoutBackgroundColothis.end = end;this.isLastRow = isLastRow;}+ @Overridepublic Color getPaddingColor(int gap) {if (gap == -1) {if (isLastRow) {@@ -51,6 +53,7 @@ public class LayoutBackgroundColorManagerAdapter implements LayoutBackgroundColo}return layoutSelectionMap.getPaddingColor(gap+start);}+ @Overridepublic Color getBackgroundColor(FieldLocation location) {return layoutSelectionMap.getBackgroundColor(location);}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/MixedFieldBackgroundColorManager.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/MixedFieldBackgroundColorManager.javaindex db211efbbe..8abdf6a79c 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/MixedFieldBackgroundColorManager.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/MixedFieldBackgroundColorManager.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -43,6 +42,7 @@ public class MixedFieldBackgroundColorManager implements FieldBackgroundColorManthis.selectionColor = selectionColor;}+ @Overridepublic List<Highlight> getSelectionHighlights(int row) {FieldLocation start = new FieldLocation(index, fieldNum, row, 0);FieldLocation end = new FieldLocation(index, fieldNum, row + 1, 0);@@ -57,6 +57,7 @@ public class MixedFieldBackgroundColorManager implements FieldBackgroundColorManreturn highlights;}+ @Overridepublic Color getBackgroundColor() {if (layoutSelection.getBackgroundColor() == backgroundColor) {return null;@@ -64,6 +65,7 @@ public class MixedFieldBackgroundColorManager implements FieldBackgroundColorManreturn backgroundColor;}+ @Overridepublic Color getPaddingColor(int padIndex) {return layoutSelection.getPaddingColor(fieldNum + padIndex);}diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/MixedLayoutBackgroundColorManager.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/MixedLayoutBackgroundColorManager.javaindex a1e56347af..7a7ce5f25d 100644--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/MixedLayoutBackgroundColorManager.java+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/MixedLayoutBackgroundColorManager.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.@@ -48,6 +48,7 @@ public class MixedLayoutBackgroundColorManager implements LayoutBackgroundColorMthis.rightBorderColor = rightBorderColor;}+ @Overridepublic FieldBackgroundColorManager getFieldBackgroundColorManager(int fieldNum) {FieldLocation start = new FieldLocation(index, fieldNum, 0, 0);FieldLocation end = new FieldLocation(index, fieldNum+1, 0, 0);@@ -67,10 +68,12 @@ public class MixedLayoutBackgroundColorManager implements LayoutBackgroundColorMreturn new MixedFieldBackgroundColorManager(index, fieldNum, this, selectionColor, fieldBackgroundColor);}+ @Overridepublic Color getBackgroundColor() {return backgroundColor;}+ @Overridepublic Color getPaddingColor(int padIndex) {Color paddingColor = null;if (padIndex == 0) {@@ -112,6 +115,7 @@ public class MixedLayoutBackgroundColorManager implements LayoutBackgroundColorMreturn selection;}+ @Overridepublic Color getBackgroundColor(FieldLocation location) {boolean isSelected = selection.contains(location);boolean isHighlighted = highlight.contains(location);diff --git a/Ghidra/Framework/Docking/src/test/java/docking/widgets/fieldpanel/AccessibleFieldTest.java b/Ghidra/Framework/Docking/src/test/java/docking/widgets/fieldpanel/AccessibleFieldTest.javaindex 678bb9ab63..f11e5f744f 100644--- a/Ghidra/Framework/Docking/src/test/java/docking/widgets/fieldpanel/AccessibleFieldTest.java+++ b/Ghidra/Framework/Docking/src/test/java/docking/widgets/fieldpanel/AccessibleFieldTest.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.@@ -39,6 +39,7 @@ public class AccessibleFieldTest extends AbstractGenericTest {private static final int FIELD_WIDTH = 75;private JPanel parent = new JPanel() {+ @Overridepublic Point getLocationOnScreen() {return new Point(PARENT_X, PARENT_Y);}diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.javaindex b1da86b4cd..c14e328eb8 100644--- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.java+++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.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.@@ -368,6 +368,7 @@ class ServerConnectTask extends Task {super(host, port);}+ @Overridepublic void connect(SocketAddress endpoint) throws IOException {connect(endpoint, LIVENESS_CHECK_TIMEOUT_MS);}diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/GhidraPrincipal.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/GhidraPrincipal.javaindex de27c0797e..7b37d87b0f 100644--- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/GhidraPrincipal.java+++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/GhidraPrincipal.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -42,6 +41,7 @@ public class GhidraPrincipal implements Principal, java.io.Serializable {/** @see java.security.Principal#getName()*/+ @Overridepublic String getName() {return username;}diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemInitializer.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemInitializer.javaindex 61e8f004b6..4658686256 100644--- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemInitializer.java+++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemInitializer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -20,7 +19,8 @@ import ghidra.framework.ModuleInitializer;import ghidra.framework.store.db.PackedDatabase;public class FileSystemInitializer implements ModuleInitializer {- public void run() {+ @Override+ public void run() {PackedDatabase.cleanupOldTempDatabases();diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalDataFileHandle.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalDataFileHandle.javaindex e2ba7005dc..5719ea55aa 100644--- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalDataFileHandle.java+++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalDataFileHandle.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -44,6 +43,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#read(byte[])*/+ @Overridepublic void read(byte[] b) throws IOException {raf.readFully(b);}@@ -51,6 +51,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#read(byte[], int, int)*/+ @Overridepublic void read(byte[] b, int off, int len) throws IOException {raf.readFully(b, off, len);}@@ -58,6 +59,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#skipBytes(int)*/+ @Overridepublic int skipBytes(int n) throws IOException {return raf.skipBytes(n);}@@ -65,6 +67,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#write(int)*/+ @Overridepublic void write(int b) throws IOException {raf.write(b);}@@ -72,6 +75,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#write(byte[])*/+ @Overridepublic void write(byte[] b) throws IOException {raf.write(b);}@@ -79,6 +83,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#write(byte[], int, int)*/+ @Overridepublic void write(byte[] b, int off, int len) throws IOException {raf.write(b, off, len);}@@ -86,6 +91,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#seek(long)*/+ @Overridepublic void seek(long pos) throws IOException {raf.seek(pos);}@@ -93,6 +99,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#length()*/+ @Overridepublic long length() throws IOException {return raf.length();}@@ -100,6 +107,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#setLength(long)*/+ @Overridepublic void setLength(long newLength) throws IOException {raf.setLength(newLength);}@@ -107,6 +115,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#close()*/+ @Overridepublic void close() throws IOException {raf.close();}@@ -114,6 +123,7 @@ public class LocalDataFileHandle implements DataFileHandle {/** @see ghidra.framework.store.DataFileHandle#isReadOnly()*/+ @Overridepublic boolean isReadOnly() throws IOException {return readOnly;}diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/UnknownFolderItem.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/UnknownFolderItem.javaindex d1ec4f62d7..c630e32ae3 100644--- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/UnknownFolderItem.java+++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/UnknownFolderItem.java@@ -157,6 +157,7 @@ public class UnknownFolderItem extends LocalFolderItem {/** @see ghidra.framework.store.FolderItem#output(java.io.File, int, ghidra.util.task.TaskMonitor)*/+ @Overridepublic void output(File outputFile, int version, TaskMonitor monitor) throws IOException {throw new UnsupportedOperationException("Output not supported for UnknownFolderItems");@@ -174,6 +175,7 @@ public class UnknownFolderItem extends LocalFolderItem {/** @see ghidra.framework.store.FolderItem#getCurrentVersion()*/+ @Overridepublic int getCurrentVersion() {return -1;}@@ -181,6 +183,7 @@ public class UnknownFolderItem extends LocalFolderItem {/** @see ghidra.framework.store.FolderItem#canRecover()*/+ @Overridepublic boolean canRecover() {return false;}diff --git a/Ghidra/Framework/Generic/src/main/java/generic/json/Json.java b/Ghidra/Framework/Generic/src/main/java/generic/json/Json.javaindex 263e1916fc..ea742c5dfe 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/json/Json.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/json/Json.java@@ -218,6 +218,7 @@ public class Json extends ToStringStyle {* @param includeFieldNamesParam the names* @return this builder*/+ @Overridepublic ReflectionToStringBuilder setIncludeFieldNames(String... includeFieldNamesParam) {if (includeFieldNamesParam == null) {this.includedNames = new String[0];diff --git a/Ghidra/Framework/Generic/src/main/java/generic/stl/EmptyIteratorSTL.java b/Ghidra/Framework/Generic/src/main/java/generic/stl/EmptyIteratorSTL.javaindex 85ef9d551b..98aee535cf 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/stl/EmptyIteratorSTL.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/stl/EmptyIteratorSTL.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -19,6 +18,7 @@ package generic.stl;public class EmptyIteratorSTL<T> implements IteratorSTL<T> {+ @Overridepublic IteratorSTL<T> copy() {return this;}@@ -31,38 +31,47 @@ public class EmptyIteratorSTL<T> implements IteratorSTL<T> {throw new UnsupportedOperationException();}+ @Overridepublic T get() {return null;}+ @Overridepublic IteratorSTL<T> increment() {throw new IndexOutOfBoundsException();}+ @Overridepublic IteratorSTL<T> decrement() {throw new IndexOutOfBoundsException();}+ @Overridepublic void insert( T value ) {throw new UnsupportedOperationException();}+ @Overridepublic boolean isBegin() {return true;}+ @Overridepublic boolean isEnd() {return true;}+ @Overridepublic void set( T value ) {throw new UnsupportedOperationException();}+ @Overridepublic IteratorSTL<T> decrement( int n ) {throw new UnsupportedOperationException();}+ @Overridepublic IteratorSTL<T> increment( int n ) {throw new UnsupportedOperationException();}@@ -75,6 +84,7 @@ public class EmptyIteratorSTL<T> implements IteratorSTL<T> {return true;}+ @Overridepublic void assign( IteratorSTL<T> otherIterator ) {throw new UnsupportedOperationException();}diff --git a/Ghidra/Framework/Generic/src/main/java/generic/stl/ListIterator.java b/Ghidra/Framework/Generic/src/main/java/generic/stl/ListIterator.javaindex 9d799fa795..c243e6602d 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/stl/ListIterator.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/stl/ListIterator.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.@@ -28,25 +28,30 @@ public class ListIterator<T> implements IteratorSTL<T> {this.node = node;}+ @Overridepublic void assign( IteratorSTL<T> otherIterator ) {ListIterator<T> other = (ListIterator<T>)otherIterator;this.list = other.list;this.root = other.root;this.node = other.node;}+ @Overridepublic IteratorSTL<T> copy() {return new ListIterator<T>( list, root, node );}+ @Overridepublic boolean isBegin() {return node == root.next;}+ @Overridepublic boolean isEnd() {return node == root;}+ @Overridepublic IteratorSTL<T> decrement() {if (node.prev == root) {throw new IndexOutOfBoundsException();@@ -55,6 +60,7 @@ public class ListIterator<T> implements IteratorSTL<T> {return this;}+ @Overridepublic T get() {if (node == root) {throw new IndexOutOfBoundsException();@@ -62,20 +68,24 @@ public class ListIterator<T> implements IteratorSTL<T> {return node.value;}+ @Overridepublic IteratorSTL<T> increment() {node = node.next;return this;}+ @Overridepublic IteratorSTL<T> increment(int count) {for(int i=0;i<count;i++) {increment();}return this;}+ @Overridepublic IteratorSTL<T> decrement( int n ) {throw new UnsupportedOperationException();}+ @Overridepublic void insert(T value) {ListNodeSTL<T> newNode = new ListNodeSTL<T>(node.prev, node, value);node.prev.next = newNode;@@ -84,6 +94,7 @@ public class ListIterator<T> implements IteratorSTL<T> {list.adjustSize(1);}+ @Overridepublic void set(T value) {if (root == node) {throw new IndexOutOfBoundsException();diff --git a/Ghidra/Framework/Generic/src/main/java/generic/stl/MapIteratorSTL.java b/Ghidra/Framework/Generic/src/main/java/generic/stl/MapIteratorSTL.javaindex 4a59ac5b6e..e91beadd4c 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/stl/MapIteratorSTL.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/stl/MapIteratorSTL.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -33,12 +32,14 @@ public class MapIteratorSTL<K, V> implements IteratorSTL<Pair<K, V>> {this.node = node;}+ @Overridepublic void assign( IteratorSTL<Pair<K,V>> otherIterator ) {MapIteratorSTL<K,V> other = (MapIteratorSTL<K, V>)otherIterator;this.tree = other.tree;this.node = other.node;this.erased = other.erased;}+ @Overridepublic IteratorSTL<Pair<K,V>> decrement() {if (node == null && tree.isEmpty()) {throw new IndexOutOfBoundsException();@@ -53,6 +54,7 @@ public class MapIteratorSTL<K, V> implements IteratorSTL<Pair<K, V>> {return this;}+ @Overridepublic Pair<K, V> get() {if (erased) {throw new IndexOutOfBoundsException("element erased");@@ -64,6 +66,7 @@ public class MapIteratorSTL<K, V> implements IteratorSTL<Pair<K, V>> {return new Pair<K,V>(node.getKey(), node.getValue());}+ @Overridepublic IteratorSTL<Pair<K,V>> increment() {if (!erased && node == null) {throw new IndexOutOfBoundsException();@@ -75,10 +78,12 @@ public class MapIteratorSTL<K, V> implements IteratorSTL<Pair<K, V>> {return this;}+ @Overridepublic void insert(Pair<K, V> value) {throw new UnsupportedOperationException();}+ @Overridepublic boolean isBegin() {if (erased) {throw new RuntimeException("Iterater in invalid state");@@ -86,6 +91,7 @@ public class MapIteratorSTL<K, V> implements IteratorSTL<Pair<K, V>> {return node == tree.getFirst();}+ @Overridepublic boolean isEnd() {if (erased) {throw new RuntimeException("Iterater in invalid state");@@ -93,16 +99,20 @@ public class MapIteratorSTL<K, V> implements IteratorSTL<Pair<K, V>> {return node == null;}+ @Overridepublic void set(Pair<K, V> value) {throw new UnsupportedOperationException();}+ @Overridepublic IteratorSTL<Pair<K, V>> copy() {return new MapIteratorSTL<K, V>(tree, node);}+ @Overridepublic IteratorSTL<Pair<K, V>> decrement( int n ) {throw new UnsupportedOperationException();}+ @Overridepublic IteratorSTL<Pair<K, V>> increment( int n ) {throw new UnsupportedOperationException();}diff --git a/Ghidra/Framework/Generic/src/main/java/generic/stl/SetIterator.java b/Ghidra/Framework/Generic/src/main/java/generic/stl/SetIterator.javaindex b01952e934..7aa1a90978 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/stl/SetIterator.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/stl/SetIterator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -32,16 +31,19 @@ public class SetIterator<T> implements IteratorSTL<T> {this.node = node;this.erased = erased;}+ @Overridepublic void assign( IteratorSTL<T> otherIterator ) {SetIterator<T> other = (SetIterator<T>) otherIterator;this.tree = other.tree;this.node = other.node;this.erased = other.erased;}+ @Overridepublic IteratorSTL<T> copy() {return new SetIterator<T>( tree, node, erased);}+ @Overridepublic IteratorSTL<T> decrement() {if (node == null && tree.isEmpty()) {throw new IndexOutOfBoundsException();@@ -56,6 +58,7 @@ public class SetIterator<T> implements IteratorSTL<T> {return this;}+ @Overridepublic T get() {if (erased) {throw new IndexOutOfBoundsException("element erased");@@ -66,6 +69,7 @@ public class SetIterator<T> implements IteratorSTL<T> {return node.getKey();}+ @Overridepublic IteratorSTL<T> increment() {if (!erased && node == null) {throw new IndexOutOfBoundsException();@@ -77,10 +81,12 @@ public class SetIterator<T> implements IteratorSTL<T> {return this;}+ @Overridepublic void insert(T value) {throw new UnsupportedOperationException();}+ @Overridepublic boolean isBegin() {if (erased) {throw new RuntimeException("Iterater in invalid state");@@ -88,6 +94,7 @@ public class SetIterator<T> implements IteratorSTL<T> {return node == tree.getFirst();}+ @Overridepublic boolean isEnd() {if (erased) {throw new RuntimeException("Iterater in invalid state");@@ -95,6 +102,7 @@ public class SetIterator<T> implements IteratorSTL<T> {return node == null;}+ @Overridepublic void set(T value) {throw new UnsupportedOperationException();}@@ -117,9 +125,11 @@ public class SetIterator<T> implements IteratorSTL<T> {public int hashCode() {return tree.hashCode();}+ @Overridepublic IteratorSTL<T> decrement( int n ) {throw new UnsupportedOperationException();}+ @Overridepublic IteratorSTL<T> increment( int n ) {throw new UnsupportedOperationException();}diff --git a/Ghidra/Framework/Generic/src/main/java/generic/stl/VectorIterator.java b/Ghidra/Framework/Generic/src/main/java/generic/stl/VectorIterator.javaindex e34c18f4cd..d9220fcaac 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/stl/VectorIterator.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/stl/VectorIterator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -33,21 +32,26 @@ public class VectorIterator<T> implements IteratorSTL<T> {return "VectorIterator: [index=" + index + " - " + value + "]";}+ @Overridepublic void assign( IteratorSTL<T> otherIterator ) {VectorIterator<T> other = (VectorIterator<T>) otherIterator;this.index = other.index;this.data = other.data;}+ @Overridepublic boolean isBegin() {return index == 0;}+ @Overridepublic boolean isEnd() {return index >= data.size();}+ @Overridepublic T get() {return data.get(index);}+ @Overridepublic void set(T value) {data.set(index, value);}@@ -56,6 +60,7 @@ public class VectorIterator<T> implements IteratorSTL<T> {return data.get(index+offset);}+ @Overridepublic IteratorSTL<T> decrement() {if (index == 0) {throw new IndexOutOfBoundsException();@@ -65,6 +70,7 @@ public class VectorIterator<T> implements IteratorSTL<T> {}+ @Overridepublic IteratorSTL<T> increment() {if (index >= data.size()) {throw new IndexOutOfBoundsException();@@ -73,6 +79,7 @@ public class VectorIterator<T> implements IteratorSTL<T> {return this;}+ @Overridepublic IteratorSTL<T> increment(int count) {if (index+count > data.size()) {throw new IndexOutOfBoundsException();@@ -80,6 +87,7 @@ public class VectorIterator<T> implements IteratorSTL<T> {index += count;return this;}+ @Overridepublic IteratorSTL<T> decrement(int count) {if (index-count < 0) {throw new IndexOutOfBoundsException();@@ -89,6 +97,7 @@ public class VectorIterator<T> implements IteratorSTL<T> {}+ @Overridepublic void insert(T value) {data.add(index, value);}@@ -112,6 +121,7 @@ public class VectorIterator<T> implements IteratorSTL<T> {public int hashCode() {return data.hashCode();}+ @Overridepublic IteratorSTL<T> copy() {return new VectorIterator<T>(data, index);}diff --git a/Ghidra/Framework/Generic/src/main/java/generic/timer/GhidraSwinglessTimer.java b/Ghidra/Framework/Generic/src/main/java/generic/timer/GhidraSwinglessTimer.javaindex 67472ad139..efc6ebe4e0 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/timer/GhidraSwinglessTimer.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/timer/GhidraSwinglessTimer.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.@@ -114,6 +114,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {* Returns the delay for all callbacks after the first callback.* @return the delay for all callbacks after the first callback.*/+ @Overridepublic int getDelay() {return delay;}@@ -122,6 +123,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {* Returns the delay for the first callback.* @return the delay for the first callback.*/+ @Overridepublic int getInitialDelay() {return initialDelay;}@@ -130,6 +132,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {* Returns true if this timer is set to repeating.* @return true if this timer is set to repeating.*/+ @Overridepublic boolean isRepeats() {return repeats;}@@ -137,6 +140,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {/*** Sets the delay for all callbacks after the first callback*/+ @Overridepublic synchronized void setDelay(int delay) {this.delay = delay;if (isRunning()) {@@ -148,6 +152,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {/*** Sets the delay for the first callbacks.*/+ @Overridepublic synchronized void setInitialDelay(int initialDelay) {this.initialDelay = initialDelay;}@@ -156,6 +161,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {* Sets whether this timer repeats.* @param repeats if true, the timer will repeat, if false the timer will only fire once.*/+ @Overridepublic synchronized void setRepeats(boolean repeats) {this.repeats = repeats;}@@ -163,6 +169,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {/*** Sets the callback to be called when the timer fires.*/+ @Overridepublic synchronized void setTimerCallback(TimerCallback callback) {this.callback = callback;}@@ -170,6 +177,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {/*** Starts the timer.*/+ @Overridepublic synchronized void start() {if (timerTask != null) {return;@@ -182,6 +190,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {/*** Stops the timer.*/+ @Overridepublic synchronized void stop() {if (timerTask != null) {timerTask.cancel();@@ -193,6 +202,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {/*** Returns true if the timer is running.*/+ @Overridepublic synchronized boolean isRunning() {return timerTask != null;}@@ -228,6 +238,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {TimerCallback callback1 = new TimerCallback() {int i = 0;+ @Overridepublic void timerFired() {System.out.println("A: "+i);if (++i == 20) {@@ -242,6 +253,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {TimerCallback callback2 = new TimerCallback() {int i = 0;+ @Overridepublic void timerFired() {System.out.println("B: "+i);if (++i == 100) {@@ -266,6 +278,7 @@ public class GhidraSwinglessTimer implements GhidraTimer {TimerCallback callback3 = new TimerCallback() {int i = 0;+ @Overridepublic void timerFired() {System.out.println("C: "+i);if (++i == 100) {diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ShutdownHookRegistry.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ShutdownHookRegistry.javaindex 13f0394535..651dc5d772 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ShutdownHookRegistry.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ShutdownHookRegistry.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.@@ -55,6 +55,7 @@ public class ShutdownHookRegistry {return;}Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {+ @Overridepublic void run() {notifyHooks();}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/LongIterator.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/LongIterator.javaindex 4af91f0bec..8f728408cb 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/LongIterator.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/LongIterator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -25,15 +24,19 @@ public interface LongIterator {* A default implementation of LongIterator that has no values.*/public final static LongIterator EMPTY = new LongIterator() {+ @Overridepublic boolean hasNext() {return false;}+ @Overridepublic long next() {return 0;}+ @Overridepublic boolean hasPrevious() {return false;}+ @Overridepublic long previous() {return 0;}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/BitTree.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/BitTree.javaindex 3fad67bdae..1342756c4d 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/BitTree.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/BitTree.java@@ -110,7 +110,8 @@ public class BitTree implements ShortKeySet, Serializable {/*** Removes all keys from the set.*/- public void removeAll() {+ @Override+ public void removeAll() {Arrays.fill(bits,0);numKeys = 0;}@@ -118,7 +119,8 @@ public class BitTree implements ShortKeySet, Serializable {/*** Returns the number of keys currently in the set.*/- public int size() {+ @Override+ public int size() {return numKeys;}@@ -128,7 +130,8 @@ public class BitTree implements ShortKeySet, Serializable {* @exception IndexOutOfBoundsException if the given key is not* in the range [0, size-1].*/- public void put(short key) {+ @Override+ public void put(short key) {if ((key < 0) || (key >= size)) {throw new IndexOutOfBoundsException();@@ -165,7 +168,8 @@ public class BitTree implements ShortKeySet, Serializable {* @exception IndexOutOfBoundsException if the given key is not* in the range [0, size-1].*/- public boolean remove(short key) {+ @Override+ public boolean remove(short key) {if ((key < 0) || (key >= size)) {throw new IndexOutOfBoundsException();@@ -204,7 +208,8 @@ public class BitTree implements ShortKeySet, Serializable {* @param key the key to check if it is in this set.* @return true if the key is in the set.*/- public boolean containsKey(short key) {+ @Override+ public boolean containsKey(short key) {if ((key < 0) || (key >= size)) {return false;}@@ -219,7 +224,8 @@ public class BitTree implements ShortKeySet, Serializable {* @exception IndexOutOfBoundsException if the given key is not* in the range [0, size-1].*/- public short getNext(short key) {+ @Override+ public short getNext(short key) {if ((key < 0) || (key >= size)) {throw new IndexOutOfBoundsException();}@@ -278,7 +284,8 @@ public class BitTree implements ShortKeySet, Serializable {* @exception IndexOutOfBoundsException if the given key is not* in the range [0, size-1].*/- public short getPrevious(short key) {+ @Override+ public short getPrevious(short key) {if ((key < 0) || (key >= size)) {throw new IndexOutOfBoundsException();}@@ -323,14 +330,16 @@ public class BitTree implements ShortKeySet, Serializable {* Checks if the set is empty.* @return true if the set is empty.*/- public boolean isEmpty() {+ @Override+ public boolean isEmpty() {return numKeys == 0;}/*** Returns the first (lowest) key in the set.*/- public short getFirst() {+ @Override+ public short getFirst() {// if the 0 key is in the set, then return it.if(containsKey((short)0)) {return (short)0;@@ -342,7 +351,8 @@ public class BitTree implements ShortKeySet, Serializable {/*** Returns the last (highest) key in the set.*/- public short getLast() {+ @Override+ public short getLast() {// if the highest possible key is in the set, return it.if(containsKey((short)(size-1))) {return (short)(size-1);diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/BooleanArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/BooleanArray.javaindex 039a9dfb0c..4fc6a29e9f 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/BooleanArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/BooleanArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -88,7 +87,8 @@ public class BooleanArray implements Array, Serializable {/** Sets the value at the given index to 0.* @param index the index to set to 0.*/- public void remove(int index) {+ @Override+ public void remove(int index) {put(index,false);}/** Returns the boolean at the given index@@ -123,7 +123,8 @@ public class BooleanArray implements Array, Serializable {/*** Returns the index of the last non-null or non-zero element in the array.*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastNonZeroIndex;}@@ -131,7 +132,8 @@ public class BooleanArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#copyDataTo(int, ghidra.util.datastruct.DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putBoolean(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ByteArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ByteArray.javaindex b7b570cd15..142c455a6f 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ByteArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ByteArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -63,7 +62,8 @@ public class ByteArray implements Array, Serializable {* @param index the index to set to 0.* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {if (index >= bytes.length) {return;}@@ -122,7 +122,8 @@ public class ByteArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#getLastNonEmptyIndex()*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastNonZeroIndex;}@@ -130,7 +131,8 @@ public class ByteArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#copyDataTo(int, DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putByte(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ByteArrayArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ByteArrayArray.javaindex a95f3401a9..acfbbc0302 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ByteArrayArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ByteArrayArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -106,7 +105,8 @@ public class ByteArrayArray implements Array, Serializable {* @param index index of the array to be removed* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {try {if (starts[index] > 0) {totalSpaceAllocated -= lengths[index];@@ -212,14 +212,16 @@ public class ByteArrayArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#getLastNonEmptyIndex()*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastStart;}/**** @see ghidra.util.datastruct.Array#copyDataTo(int, DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putByteArray(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArray.javaindex 0db6c03af9..0044b9bad0 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -62,7 +61,8 @@ public class DoubleArray implements Array, Serializable {* @param index the index to set to 0.* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {if (index >= doubles.length) {return;}@@ -121,7 +121,8 @@ public class DoubleArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#getLastNonEmptyIndex()*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastNonZeroIndex;}@@ -129,7 +130,8 @@ public class DoubleArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#copyDataTo(int, DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putDouble(toIndex, toCol, get(index));}}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArrayArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArrayArray.javaindex 0fc906b916..54860d2009 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArrayArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArrayArray.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.@@ -107,7 +107,8 @@ public class DoubleArrayArray implements Array, Serializable {/** Removes the array at the given index* @param index index of the array to be removed*/- public void remove(int index) {+ @Override+ public void remove(int index) {try {if (starts[index] > 0) {totalSpaceAllocated -= lengths[index];@@ -213,7 +214,8 @@ public class DoubleArrayArray implements Array, Serializable {/*** Returns the index of the last non-null or non-zero element in the array.*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastStart;}@@ -221,7 +223,8 @@ public class DoubleArrayArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#copyDataTo(int, DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putDoubleArray(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FloatArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FloatArray.javaindex 655b54470c..0682206b1e 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FloatArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FloatArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -62,7 +61,8 @@ public class FloatArray implements Array, Serializable {* @param index the index to set to 0.* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {if (index >= floats.length) {return;}@@ -120,14 +120,16 @@ public class FloatArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#getLastNonEmptyIndex()*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastNonZeroIndex;}/**** @see ghidra.util.datastruct.Array#copyDataTo(int, DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putFloat(toIndex, toCol, get(index));}}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FloatArrayArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FloatArrayArray.javaindex 13ec3cef69..d93b144d2b 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FloatArrayArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FloatArrayArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -110,7 +109,8 @@ public class FloatArrayArray implements Array, Serializable {* @param index index of the array to be removed* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {try {if (starts[index] > 0) {totalSpaceAllocated -= lengths[index];@@ -215,7 +215,8 @@ public class FloatArrayArray implements Array, Serializable {/*** Returns the index of the last non-null or non-zero element in the array.*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastStart;}@@ -223,7 +224,8 @@ public class FloatArrayArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#copyDataTo(int, DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putFloatArray(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FullKeySet.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FullKeySet.javaindex 64f260db9d..43bca00f8c 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FullKeySet.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/FullKeySet.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.@@ -37,7 +37,8 @@ public class FullKeySet implements ShortKeySet, Serializable {/*** Returns the number of keys currently in the set.*/- public int size() {+ @Override+ public int size() {return numKeys;}@@ -45,7 +46,8 @@ public class FullKeySet implements ShortKeySet, Serializable {** @see ghidra.util.datastruct.ShortKeySet#containsKey(short)*/- public boolean containsKey(short key) {+ @Override+ public boolean containsKey(short key) {if ((key >= 0) &&(key < numKeys)) {return true;}@@ -56,7 +58,8 @@ public class FullKeySet implements ShortKeySet, Serializable {** @see ghidra.util.datastruct.ShortKeySet#getFirst()*/- public short getFirst() {+ @Override+ public short getFirst() {return (short)0;}@@ -64,7 +67,8 @@ public class FullKeySet implements ShortKeySet, Serializable {** @see ghidra.util.datastruct.ShortKeySet#getLast()*/- public short getLast() {+ @Override+ public short getLast() {return (short)(numKeys-1);}@@ -72,7 +76,8 @@ public class FullKeySet implements ShortKeySet, Serializable {** @see ghidra.util.datastruct.ShortKeySet#put(short)*/- public void put(short key) {+ @Override+ public void put(short key) {if ((key < 0) || (key >= numKeys)) {throw new IndexOutOfBoundsException();}@@ -82,7 +87,8 @@ public class FullKeySet implements ShortKeySet, Serializable {** @see ghidra.util.datastruct.ShortKeySet#remove(short)*/- public boolean remove(short key) {+ @Override+ public boolean remove(short key) {if ((key < 0) || (key >= numKeys)) {throw new IndexOutOfBoundsException();}@@ -94,7 +100,8 @@ public class FullKeySet implements ShortKeySet, Serializable {** @see ghidra.util.datastruct.ShortKeySet#removeAll()*/- public void removeAll() {+ @Override+ public void removeAll() {throw new UnsupportedOperationException();}@@ -102,7 +109,8 @@ public class FullKeySet implements ShortKeySet, Serializable {** @see ghidra.util.datastruct.ShortKeySet#getNext(short)*/- public short getNext(short key) {+ @Override+ public short getNext(short key) {if ((key < 0) || (key >= numKeys)) {throw new IndexOutOfBoundsException();}@@ -116,7 +124,8 @@ public class FullKeySet implements ShortKeySet, Serializable {** @see ghidra.util.datastruct.ShortKeySet#getPrevious(short)*/- public short getPrevious(short key) {+ @Override+ public short getPrevious(short key) {if ((key < 0) || (key >= numKeys)) {throw new IndexOutOfBoundsException();}@@ -130,7 +139,8 @@ public class FullKeySet implements ShortKeySet, Serializable {** @see ghidra.util.datastruct.ShortKeySet#isEmpty()*/- public boolean isEmpty() {+ @Override+ public boolean isEmpty() {return false;}}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArray.javaindex f150af39e8..39af6182b4 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -62,7 +61,8 @@ public class IntArray implements Array, Serializable {* @param index the index to set to 0.* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {if (index >= ints.length) {return;}@@ -119,14 +119,16 @@ public class IntArray implements Array, Serializable {/*** @see ghidra.util.datastruct.Array#getLastNonEmptyIndex()*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastNonZeroIndex;}/*** @see ghidra.util.datastruct.Array#copyDataTo(int, DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putInt(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArrayArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArrayArray.javaindex 7088f8d951..e7a99b38ac 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArrayArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArrayArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -106,7 +105,8 @@ public class IntArrayArray implements Array, Serializable {* @param index index of the array to be removed* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {try {if (starts[index] > 0) {totalSpaceAllocated -= lengths[index];@@ -211,14 +211,16 @@ public class IntArrayArray implements Array, Serializable {/*** @see ghidra.util.datastruct.Array#getLastNonEmptyIndex()*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastStart;}/*** @see ghidra.util.datastruct.Array#copyDataTo(int, ghidra.util.datastruct.DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putIntArray(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArray.javaindex fcab88123c..d832185b1d 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -65,7 +64,8 @@ public class LongArray implements Array, Serializable {* @param index the index to set to 0.* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {if (index >= longs.length) {return;}@@ -124,7 +124,8 @@ public class LongArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#getLastNonEmptyIndex()*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastNonZeroIndex;}@@ -132,7 +133,8 @@ public class LongArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#copyDataTo(int, ghidra.util.datastruct.DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putLong(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArrayArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArrayArray.javaindex 54b507ae41..c65afcfb3a 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArrayArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArrayArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -111,7 +110,8 @@ public class LongArrayArray implements Array, Serializable {* @param index index of the array to be removed* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {try {if (starts[index] > 0) {totalSpaceAllocated -= lengths[index];@@ -217,14 +217,16 @@ public class LongArrayArray implements Array, Serializable {/*** Returns the index of the last non-null or non-zero element in the array.*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastStart;}/**** @see ghidra.util.datastruct.Array#copyDataTo(int, ghidra.util.datastruct.DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putLongArray(toIndex, toCol, get(index));}}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectArray.javaindex dc170893a4..c36fc23404 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -66,7 +65,8 @@ public class ObjectArray implements Array, Serializable {* @param index the index to set to null.* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {if (index >= objs.length) {return;}@@ -125,14 +125,16 @@ public class ObjectArray implements Array, Serializable {/*** @see ghidra.util.datastruct.Array#getLastNonEmptyIndex()*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastNonZeroIndex;}/*** @see ghidra.util.datastruct.Array#copyDataTo(int, ghidra.util.datastruct.DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putObject(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectRangeMap.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectRangeMap.javaindex 36c89613d3..bea72f859c 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectRangeMap.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectRangeMap.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.@@ -270,10 +270,12 @@ public class ObjectRangeMap <T> {class SimpleIndexRangeIterator implements IndexRangeIterator {int pos = 0;+ @Overridepublic boolean hasNext() {return pos < ranges.size();}+ @Overridepublic IndexRange next() {ObjectValueRange<T> valueRange = ranges.get(pos++);return new IndexRange(valueRange.getStart(), valueRange.getEnd());@@ -308,10 +310,12 @@ public class ObjectRangeMap <T> {}}+ @Overridepublic boolean hasNext() {return nextRange != null;}+ @Overridepublic IndexRange next() {IndexRange retRange = nextRange;if (nextRange != null) {diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectValueRange.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectValueRange.javaindex b34df6f872..f90d7dbed3 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectValueRange.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectValueRange.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.@@ -64,6 +64,7 @@ public class ObjectValueRange<T> implements Comparable<ObjectValueRange<T>> {/*** @see java.lang.Comparable#compareTo(java.lang.Object)*/+ @Overridepublic int compareTo(ObjectValueRange<T> otherRange) {if (start < otherRange.start) {return -1;diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/PropertySetIndexRangeIterator.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/PropertySetIndexRangeIterator.javaindex 49b4f78668..391618cd35 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/PropertySetIndexRangeIterator.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/PropertySetIndexRangeIterator.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.@@ -41,14 +41,16 @@ public class PropertySetIndexRangeIterator implements IndexRangeIterator {/*** @see ghidra.util.datastruct.IndexRangeIterator#hasNext()*/- public boolean hasNext() {+ @Override+ public boolean hasNext() {return indexRange != null;}/*** @see ghidra.util.datastruct.IndexRangeIterator#next()*/- public IndexRange next() {+ @Override+ public IndexRange next() {IndexRange temp = indexRange;getNextIndexRange();return temp;diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/RedBlackKeySet.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/RedBlackKeySet.javaindex 761ca911d2..0dd7a0c924 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/RedBlackKeySet.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/RedBlackKeySet.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.@@ -59,6 +59,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {/*** Returns the number keys in this set.*/+ @Overridepublic int size() {return size;}@@ -69,6 +70,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {* @exception IndexOutOfBoundsException thrown if the given key is not* in the range [0, maxKey].*/+ @Overridepublic boolean containsKey(short key) {if ((key < 0) || (key > maxKey)) {throw new IndexOutOfBoundsException();@@ -92,6 +94,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {/*** Returns the first key in this set.*/+ @Overridepublic short getFirst() {if (root == null) {return -1;@@ -107,6 +110,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {/*** Returns the last key in this set.*/+ @Overridepublic short getLast() {if (root == null) {return -1;@@ -127,6 +131,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {* @exception IndexOutOfBoundsException thrown if the given key is not* in the range [0, maxKey].*/+ @Overridepublic short getNext(short key) {if ((key < 0) || (key > maxKey)) {throw new IndexOutOfBoundsException();@@ -161,6 +166,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {* @exception IndexOutOfBoundsException thrown if the given key is not* in the range [0, maxKey].*/+ @Overridepublic short getPrevious(short key) {if ((key < 0) || (key > maxKey)) {throw new IndexOutOfBoundsException();@@ -193,6 +199,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {* @exception IndexOutOfBoundsException thrown if the given key is not* in the range [0, maxKey].*/+ @Overridepublic void put(short key) {if ((key < 0) || (key > maxKey)) {throw new IndexOutOfBoundsException();@@ -239,6 +246,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {* @exception IndexOutOfBoundsException thrown if the given key is not* in the range [0, maxKey].*/+ @Overridepublic boolean remove(short key) {if ((key < 0) || (key > maxKey)) {throw new IndexOutOfBoundsException();@@ -268,6 +276,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {/*** Removes all keys from the set.*/+ @Overridepublic void removeAll() {size = 0;root = null;@@ -277,6 +286,7 @@ public class RedBlackKeySet implements ShortKeySet, Serializable {* Test if the set is empty.*@return true if the set is empty.*/+ @Overridepublic boolean isEmpty() {return size == 0;}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortArray.javaindex 33a7d7d017..3163934a09 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -65,7 +64,8 @@ public class ShortArray implements Array, Serializable {* @param index the index to set to 0.* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {if (index >= shorts.length) {return;}@@ -124,7 +124,8 @@ public class ShortArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#getLastNonEmptyIndex()*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastNonZeroIndex;}@@ -132,7 +133,8 @@ public class ShortArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#copyDataTo(int, ghidra.util.datastruct.DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putShort(toIndex, toCol, get(index));}}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortArrayArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortArrayArray.javaindex 0e0b81e655..d0c41cf246 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortArrayArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortArrayArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -110,7 +109,8 @@ public class ShortArrayArray implements Array, Serializable {* @param index index of the array to be removed* @throws IndexOutOfBoundsException if the index is negative*/- public void remove(int index) {+ @Override+ public void remove(int index) {try {if (starts[index] > 0) {totalSpaceAllocated -= lengths[index];@@ -215,7 +215,8 @@ public class ShortArrayArray implements Array, Serializable {/*** Returns the index of the last non-null or non-zero element in the array.*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastStart;}@@ -223,7 +224,8 @@ public class ShortArrayArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#copyDataTo(int, ghidra.util.datastruct.DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putShortArray(toIndex, toCol, get(index));}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringArray.javaindex 932370851f..5be0267f1b 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -109,7 +108,8 @@ public class StringArray implements Array, Serializable {/** Removes the string at the given index* @param index index of the string to be removed*/- public void remove(int index) {+ @Override+ public void remove(int index) {try {if (starts[index] > 0) {totalSpaceAllocated -= lengths[index];@@ -216,7 +216,8 @@ public class StringArray implements Array, Serializable {/*** Returns the index of the last non-null or non-zero element in the array.*/- public int getLastNonEmptyIndex() {+ @Override+ public int getLastNonEmptyIndex() {return lastStart;}@@ -224,7 +225,8 @@ public class StringArray implements Array, Serializable {** @see ghidra.util.datastruct.Array#copyDataTo(int, ghidra.util.datastruct.DataTable, int, int)*/- public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {+ @Override+ public void copyDataTo(int index, DataTable table, int toIndex, int toCol) {table.putString(toIndex, toCol, get(index));}}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringArrayArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringArrayArray.javaindex e4d87a7a9b..feb058e906 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringArrayArray.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringArrayArray.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -62,6 +61,7 @@ public class StringArrayArray implements Array, Serializable {/*** @see Array#copyDataTo(int, DataTable, int, int)*/+ @Overridepublic void copyDataTo(int index,DataTable table,int toIndex,@@ -73,6 +73,7 @@ public class StringArrayArray implements Array, Serializable {/*** @see Array#getLastNonEmptyIndex()*/+ @Overridepublic int getLastNonEmptyIndex() {return byteStore.getLastNonEmptyIndex();}@@ -80,6 +81,7 @@ public class StringArrayArray implements Array, Serializable {/*** @see Array#remove(int)*/+ @Overridepublic void remove(int index) {byteStore.remove(index);}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringKeyIndexer.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringKeyIndexer.javaindex 471737ca05..f1ed1683e3 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringKeyIndexer.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringKeyIndexer.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.@@ -235,6 +235,7 @@ public class StringKeyIndexer implements Serializable {/* (non-Javadoc)* @see java.util.Iterator#hasNext()*/+ @Overridepublic boolean hasNext() {return nextKey != null;}@@ -242,7 +243,8 @@ public class StringKeyIndexer implements Serializable {/* (non-Javadoc)* @see java.util.Iterator#next()*/- public String next() {+ @Override+ public String next() {if (hasNext()) {String result = nextKey;findNext();@@ -254,7 +256,8 @@ public class StringKeyIndexer implements Serializable {/* (non-Javadoc)* @see java.util.Iterator#remove()*/- public void remove() {+ @Override+ public void remove() {throw new UnsupportedOperationException();}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/exception/MultipleCauses.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/exception/MultipleCauses.javaindex 0d2834a4f9..9727b82334 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/exception/MultipleCauses.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/exception/MultipleCauses.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.@@ -119,6 +119,7 @@ public class MultipleCauses extends Throwable {/*** Use addCause instead*/+ @Overridepublic synchronized Throwable initCause(Throwable cause) {throw new UnsupportedOperationException("Use addCause instead");}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/map/LongIteratorImpl.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/map/LongIteratorImpl.javaindex db07c3fcff..67be9d4f81 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/map/LongIteratorImpl.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/map/LongIteratorImpl.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.@@ -82,7 +82,8 @@ class LongIteratorImpl implements LongIterator {/*** Returns true if the iterator has more indexes.*/- public boolean hasNext(){+ @Override+ public boolean hasNext(){if (doesHaveNext) {return true;@@ -93,7 +94,8 @@ class LongIteratorImpl implements LongIterator {/*** Returns the next index in the iterator.*/- public long next() {+ @Override+ public long next() {if (hasNext()) {doesHaveNext = false;doesHavePrevious = true;@@ -105,7 +107,8 @@ class LongIteratorImpl implements LongIterator {/*** Return true if the iterator has a previous index.*/- public boolean hasPrevious() {+ @Override+ public boolean hasPrevious() {if (doesHavePrevious) {return true;}@@ -116,7 +119,8 @@ class LongIteratorImpl implements LongIterator {/*** Returns the previous index in the iterator.*/- public long previous() {+ @Override+ public long previous() {if (hasPrevious()) {doesHavePrevious = false;doesHaveNext = true;diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/map/ObjectStorageAdapter.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/map/ObjectStorageAdapter.javaindex 59fa7801da..1865d14b29 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/map/ObjectStorageAdapter.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/map/ObjectStorageAdapter.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.@@ -39,6 +39,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putInt(int)*/+ @Overridepublic void putInt(int value) {table.putInt(row, col++, value);}@@ -46,6 +47,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putByte(byte)*/+ @Overridepublic void putByte(byte value) {table.putByte(row, col++, value);}@@ -53,6 +55,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putShort(short)*/+ @Overridepublic void putShort(short value) {table.putShort(row, col++, value);}@@ -60,6 +63,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putLong(long)*/+ @Overridepublic void putLong(long value) {table.putLong(row, col++, value);}@@ -67,6 +71,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putString(String)*/+ @Overridepublic void putString(String value) {table.putString(row, col++, value);}@@ -74,6 +79,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putBoolean(boolean)*/+ @Overridepublic void putBoolean(boolean value) {table.putBoolean(row, col++, value);}@@ -81,6 +87,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putFloat(float)*/+ @Overridepublic void putFloat(float value) {table.putFloat(row, col++, value);}@@ -88,6 +95,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putDouble(double)*/+ @Overridepublic void putDouble(double value) {table.putDouble(row, col++, value);}@@ -95,6 +103,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getInt()*/+ @Overridepublic int getInt() {return table.getInt(row, col++);}@@ -102,6 +111,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getByte()*/+ @Overridepublic byte getByte() {return table.getByte(row, col++);}@@ -109,6 +119,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getShort()*/+ @Overridepublic short getShort() {return table.getShort(row, col++);}@@ -116,6 +127,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getLong()*/+ @Overridepublic long getLong() {return table.getLong(row, col++);}@@ -123,6 +135,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getBoolean()*/+ @Overridepublic boolean getBoolean() {return table.getBoolean(row, col++);}@@ -130,6 +143,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getString()*/+ @Overridepublic String getString() {return table.getString(row, col++);}@@ -137,6 +151,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getFloat()*/+ @Overridepublic float getFloat() {return table.getFloat(row, col++);}@@ -144,6 +159,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getDouble()*/+ @Overridepublic double getDouble() {return table.getDouble(row, col++);}@@ -151,6 +167,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putInts(int[])*/+ @Overridepublic void putInts(int[] value) {table.putIntArray(row, col++, value);}@@ -158,6 +175,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putBytes(byte[])*/+ @Overridepublic void putBytes(byte[] value) {table.putByteArray(row, col++, value);}@@ -165,6 +183,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putShorts(short[])*/+ @Overridepublic void putShorts(short[] value) {table.putShortArray(row, col++, value);}@@ -172,6 +191,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putLongs(long[])*/+ @Overridepublic void putLongs(long[] value) {table.putLongArray(row, col++, value);}@@ -179,6 +199,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putFloats(float[])*/+ @Overridepublic void putFloats(float[] value) {table.putFloatArray(row, col++, value);}@@ -186,6 +207,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putDoubles(double[])*/+ @Overridepublic void putDoubles(double[] value) {table.putDoubleArray(row, col++, value);}@@ -193,6 +215,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getInts()*/+ @Overridepublic int[] getInts() {return table.getIntArray(row, col++);}@@ -200,6 +223,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getBytes()*/+ @Overridepublic byte[] getBytes() {return table.getByteArray(row, col++);}@@ -207,6 +231,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getShorts()*/+ @Overridepublic short[] getShorts() {return table.getShortArray(row, col++);}@@ -214,6 +239,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getLongs()*/+ @Overridepublic long[] getLongs() {return table.getLongArray(row, col++);}@@ -222,6 +248,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getFloats()*/+ @Overridepublic float[] getFloats() {return table.getFloatArray(row, col++);}@@ -229,6 +256,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getDoubles()*/+ @Overridepublic double[] getDoubles() {return table.getDoubleArray(row, col++);}@@ -236,6 +264,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#getStrings()*/+ @Overridepublic String[] getStrings() {return table.getStringArray(row, col++);}@@ -243,6 +272,7 @@ public class ObjectStorageAdapter implements ObjectStorage {/*** @see ObjectStorage#putStrings(String[])*/+ @Overridepublic void putStrings(String[] value) {table.putStringArray(row, col++, value);}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/SpecXmlUtils.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/SpecXmlUtils.javaindex 58d7b92187..68deccdb15 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/SpecXmlUtils.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/SpecXmlUtils.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.@@ -231,14 +231,17 @@ public class SpecXmlUtils {public static ErrorHandler getXmlHandler() {return new ErrorHandler() {+ @Overridepublic void error(SAXParseException exception) throws SAXException {throw new SAXException("Error: "+exception);}+ @Overridepublic void fatalError(SAXParseException exception) throws SAXException {throw new SAXException("Fatal error: "+exception);}+ @Overridepublic void warning(SAXParseException exception) throws SAXException {throw new SAXException("Warning: "+exception);}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/xml/XmlTreeNode.java b/Ghidra/Framework/Generic/src/main/java/ghidra/xml/XmlTreeNode.javaindex 92ab2cee90..db5f3489cf 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/xml/XmlTreeNode.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/xml/XmlTreeNode.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -139,10 +138,12 @@ public class XmlTreeNode {nextNode = null;}+ @Overridepublic void remove() {it.remove();}+ @Overridepublic boolean hasNext() {if (nextNode == null) {findNext();@@ -150,6 +151,7 @@ public class XmlTreeNode {return nextNode != null;}+ @Overridepublic XmlTreeNode next() {if (hasNext()) {XmlTreeNode node = nextNode;diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/service/graph/VertexShape.java b/Ghidra/Framework/Graph/src/main/java/ghidra/service/graph/VertexShape.javaindex fdae41ecec..0666ef5225 100644--- a/Ghidra/Framework/Graph/src/main/java/ghidra/service/graph/VertexShape.java+++ b/Ghidra/Framework/Graph/src/main/java/ghidra/service/graph/VertexShape.java@@ -157,6 +157,7 @@ public abstract class VertexShape {super("Rectangle", size);}+ @Overrideprotected Shape createShape() {return new Rectangle2D.Double(-1.0, -1.0, 2.0, 2.0);}@@ -168,6 +169,7 @@ public abstract class VertexShape {super("Ellipse", size);}+ @Overrideprotected Shape createShape() {return new Ellipse2D.Double(-1.0, -1.0, 2.0, 2.0);}@@ -184,6 +186,7 @@ public abstract class VertexShape {super("Triangle Up", size);}+ @Overrideprotected Shape createShape() {Path2D path = new Path2D.Double();path.moveTo(-1.0, 1.0);@@ -209,6 +212,7 @@ public abstract class VertexShape {super("Triangle Down", size);}+ @Overrideprotected Shape createShape() {Path2D path = new Path2D.Double();path.moveTo(-1.0, -1.0);@@ -235,6 +239,7 @@ public abstract class VertexShape {super("Star", size);}+ @Overrideprotected Shape createShape() {int numPoints = 7;Path2D path = new Path2D.Double();@@ -264,6 +269,7 @@ public abstract class VertexShape {super("Diamond", size);}+ @Overrideprotected Shape createShape() {Path2D path = new Path2D.Double();path.moveTo(0.0, -1.0);@@ -291,6 +297,7 @@ public abstract class VertexShape {this.startAngle = startAngle;}+ @Overrideprotected Shape createShape() {Path2D path = new Path2D.Double();diff --git a/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/MacLookAndFeelManager.java b/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/MacLookAndFeelManager.javaindex 278038b09f..3851d4bd56 100644--- a/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/MacLookAndFeelManager.java+++ b/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/MacLookAndFeelManager.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.@@ -103,6 +103,7 @@ public class MacLookAndFeelManager extends LookAndFeelManager {this.selectedMenuBacgroundColor = color;}+ @Overridepublic void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {g.setColor(selectedMenuBacgroundColor);g.fillRect(x, y, width, height);diff --git a/Ghidra/Framework/Gui/src/main/java/ghidra/util/filechooser/GhidraFileFilter.java b/Ghidra/Framework/Gui/src/main/java/ghidra/util/filechooser/GhidraFileFilter.javaindex f16ba2905a..f1eb642daf 100644--- a/Ghidra/Framework/Gui/src/main/java/ghidra/util/filechooser/GhidraFileFilter.java+++ b/Ghidra/Framework/Gui/src/main/java/ghidra/util/filechooser/GhidraFileFilter.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -29,10 +28,12 @@ public interface GhidraFileFilter {* A default implementation that shows all files.*/public final static GhidraFileFilter ALL = new GhidraFileFilter() {- public String getDescription() {+ @Override+ public String getDescription() {return "All Files (*.*)";}- public boolean accept(File pathname, GhidraFileChooserModel model) {+ @Override+ public boolean accept(File pathname, GhidraFileChooserModel model) {return true;}};diff --git a/Ghidra/Framework/Gui/src/main/java/ghidra/util/layout/VariableHeightPairLayout.java b/Ghidra/Framework/Gui/src/main/java/ghidra/util/layout/VariableHeightPairLayout.javaindex ef9cb35396..93e7a2deed 100644--- a/Ghidra/Framework/Gui/src/main/java/ghidra/util/layout/VariableHeightPairLayout.java+++ b/Ghidra/Framework/Gui/src/main/java/ghidra/util/layout/VariableHeightPairLayout.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -59,16 +58,19 @@ public class VariableHeightPairLayout implements LayoutManager {/*** @see LayoutManager#addLayoutComponent(String, Component)*/+ @Overridepublic void addLayoutComponent(String name, Component comp) {}/*** @see LayoutManager#removeLayoutComponent(Component)*/+ @Overridepublic void removeLayoutComponent(Component comp) {}/*** @see LayoutManager#preferredLayoutSize(Container)*/+ @Overridepublic Dimension preferredLayoutSize(Container parent) {Dimension d = new Dimension(0,0);Insets insets = parent.getInsets();@@ -93,6 +95,7 @@ public class VariableHeightPairLayout implements LayoutManager {/*** @see LayoutManager#minimumLayoutSize(Container)*/+ @Overridepublic Dimension minimumLayoutSize(Container parent) {return preferredLayoutSize(parent);}@@ -100,6 +103,7 @@ public class VariableHeightPairLayout implements LayoutManager {/*** @see LayoutManager#layoutContainer(Container)*/+ @Overridepublic void layoutContainer(Container parent) {int[] widths = getPreferredWidths(parent);Dimension d = parent.getSize();diff --git a/Ghidra/Framework/Gui/src/main/java/resources/icons/BytesImageIcon.java b/Ghidra/Framework/Gui/src/main/java/resources/icons/BytesImageIcon.javaindex 35702038bb..30f2557720 100644--- a/Ghidra/Framework/Gui/src/main/java/resources/icons/BytesImageIcon.java+++ b/Ghidra/Framework/Gui/src/main/java/resources/icons/BytesImageIcon.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.@@ -34,6 +34,7 @@ public class BytesImageIcon extends LazyImageIcon {this.bytes = Objects.requireNonNull(imageBytes);}+ @Overrideprotected ImageIcon createImageIcon() {String name = getFilename();Image image = createImage();diff --git a/Ghidra/Framework/Gui/src/main/java/resources/icons/ColorIcon3D.java b/Ghidra/Framework/Gui/src/main/java/resources/icons/ColorIcon3D.javaindex 9ffd2a646d..6f2c48cbaa 100644--- a/Ghidra/Framework/Gui/src/main/java/resources/icons/ColorIcon3D.java+++ b/Ghidra/Framework/Gui/src/main/java/resources/icons/ColorIcon3D.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -37,10 +36,12 @@ public class ColorIcon3D implements Icon {this.height = height;}+ @Overridepublic int getIconHeight() {return height;}+ @Overridepublic int getIconWidth() {return width;}@@ -48,6 +49,7 @@ public class ColorIcon3D implements Icon {return color;}+ @Overridepublic void paintIcon(Component c, Graphics g, int x, int y) {Color startColor = g.getColor();g.setColor(getColor());diff --git a/Ghidra/Framework/Gui/src/main/java/resources/icons/DerivedImageIcon.java b/Ghidra/Framework/Gui/src/main/java/resources/icons/DerivedImageIcon.javaindex 5605b28b69..b6683132c5 100644--- a/Ghidra/Framework/Gui/src/main/java/resources/icons/DerivedImageIcon.java+++ b/Ghidra/Framework/Gui/src/main/java/resources/icons/DerivedImageIcon.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.@@ -58,6 +58,7 @@ public class DerivedImageIcon extends LazyImageIcon {return sourceIcon;}+ @Overrideprotected boolean sourceIconChanged() {if (sourceIcon instanceof GIcon gIcon) {if (cachedDelegate != gIcon.getDelegate()) {@@ -68,6 +69,7 @@ public class DerivedImageIcon extends LazyImageIcon {return false;}+ @Overrideprotected ImageIcon createImageIcon() {Image image = createImage();String imageName = getFilename();diff --git a/Ghidra/Framework/Gui/src/main/java/resources/icons/EmptyIcon.java b/Ghidra/Framework/Gui/src/main/java/resources/icons/EmptyIcon.javaindex 220170db42..12af9db96d 100644--- a/Ghidra/Framework/Gui/src/main/java/resources/icons/EmptyIcon.java+++ b/Ghidra/Framework/Gui/src/main/java/resources/icons/EmptyIcon.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.@@ -31,14 +31,17 @@ public class EmptyIcon implements Icon {this.height = height;}+ @Overridepublic int getIconHeight() {return height;}+ @Overridepublic int getIconWidth() {return width;}+ @Overridepublic void paintIcon(Component c, Graphics g, int x, int y) {// no-op}diff --git a/Ghidra/Framework/Gui/src/main/java/resources/icons/OvalBackgroundColorIcon.java b/Ghidra/Framework/Gui/src/main/java/resources/icons/OvalBackgroundColorIcon.javaindex 36afec8734..6207090715 100644--- a/Ghidra/Framework/Gui/src/main/java/resources/icons/OvalBackgroundColorIcon.java+++ b/Ghidra/Framework/Gui/src/main/java/resources/icons/OvalBackgroundColorIcon.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -35,15 +34,18 @@ public class OvalBackgroundColorIcon implements Icon {this.height = height;}- public int getIconHeight() {+ @Override+ public int getIconHeight() {return height;}- public int getIconWidth() {+ @Override+ public int getIconWidth() {return width;}- public void paintIcon( Component c, Graphics g, int x, int y ) {+ @Override+ public void paintIcon( Component c, Graphics g, int x, int y ) {if ( c == null ) {return;}diff --git a/Ghidra/Framework/Gui/src/main/java/resources/icons/OvalColorIcon.java b/Ghidra/Framework/Gui/src/main/java/resources/icons/OvalColorIcon.javaindex bcbe317a92..a0d3cf7f21 100644--- a/Ghidra/Framework/Gui/src/main/java/resources/icons/OvalColorIcon.java+++ b/Ghidra/Framework/Gui/src/main/java/resources/icons/OvalColorIcon.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -33,15 +32,18 @@ public class OvalColorIcon implements Icon {}- public int getIconHeight() {+ @Override+ public int getIconHeight() {return height;}- public int getIconWidth() {+ @Override+ public int getIconWidth() {return width;}- public void paintIcon( Component c, Graphics g, int x, int y ) {+ @Override+ public void paintIcon( Component c, Graphics g, int x, int y ) {g.setColor( color );g.fillOval( x, y, width, height );}diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/ProjectInitializer.java b/Ghidra/Framework/Project/src/main/java/ghidra/ProjectInitializer.javaindex 52a4cef4c5..b569c22e37 100644--- a/Ghidra/Framework/Project/src/main/java/ghidra/ProjectInitializer.java+++ b/Ghidra/Framework/Project/src/main/java/ghidra/ProjectInitializer.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -19,6 +18,7 @@ package ghidra;import ghidra.framework.ModuleInitializer;public class ProjectInitializer implements ModuleInitializer {+ @Overridepublic void run() {// Register "ghidra" URL protocol Handlerdiff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ZoomedImagePainter.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ZoomedImagePainter.javaindex 14e0800f5c..0ce8a8a079 100644--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ZoomedImagePainter.java+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ZoomedImagePainter.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -46,7 +45,8 @@ public class ZoomedImagePainter implements GGlassPanePainter {this.image = image;}- public void paint( GGlassPane glassPane, Graphics g ) {+ @Override+ public void paint( GGlassPane glassPane, Graphics g ) {if ( image == null || targetBounds == null ) {return;}diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/VersionInfoTransferable.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/VersionInfoTransferable.javaindex 9f35ed35e6..a5823ae3ff 100644--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/VersionInfoTransferable.java+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/VersionInfoTransferable.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -64,6 +63,7 @@ public class VersionInfoTransferable implements Transferable, ClipboardOwner {/* (non-Javadoc)* @see java.awt.datatransfer.Transferable#getTransferDataFlavors()*/+ @Overridepublic DataFlavor[] getTransferDataFlavors() {return flavors;}@@ -71,6 +71,7 @@ public class VersionInfoTransferable implements Transferable, ClipboardOwner {/* (non-Javadoc)* @see java.awt.datatransfer.Transferable#isDataFlavorSupported(java.awt.datatransfer.DataFlavor)*/+ @Overridepublic boolean isDataFlavorSupported(DataFlavor flavor) {return flavorList.contains(flavor);}@@ -78,6 +79,7 @@ public class VersionInfoTransferable implements Transferable, ClipboardOwner {/* (non-Javadoc)* @see java.awt.datatransfer.Transferable#getTransferData(java.awt.datatransfer.DataFlavor)*/+ @Overridepublic Object getTransferData(DataFlavor flavor)throws UnsupportedFlavorException, IOException {if (flavor.equals(localVersionInfoFlavor)) {@@ -89,6 +91,7 @@ public class VersionInfoTransferable implements Transferable, ClipboardOwner {/* (non-Javadoc)* @see java.awt.datatransfer.ClipboardOwner#lostOwnership(java.awt.datatransfer.Clipboard, java.awt.datatransfer.Transferable)*/+ @Overridepublic void lostOwnership(Clipboard clipboard, Transferable contents) {}/**diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/OpenFileDropHandlerFactory.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/OpenFileDropHandlerFactory.javaindex bf1018ed78..b85abf6138 100644--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/OpenFileDropHandlerFactory.java+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/OpenFileDropHandlerFactory.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -37,7 +36,8 @@ class OpenFileDropHandlerFactory implements DropTargetFactory {}- public DropTargetHandler createDropTargetHandler( Component component ) {+ @Override+ public DropTargetHandler createDropTargetHandler( Component component ) {return new FileOpenDropHandler( tool, component );}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Constant.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Constant.javaindex 7506e44aa9..04eb569edc 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Constant.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Constant.java@@ -24,6 +24,8 @@ public class Constant implements ExpressionValue {val = v;}+ @Overridepublic long longValue(MemBuffer buf, int off) { return val; }+ @Overridepublic int length(MemBuffer buf, int off) { return 0; }}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Label.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Label.javaindex a696f7169c..806f090638 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Label.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Label.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.@@ -29,10 +29,12 @@ public class Label implements ExpressionValue {public Label() {}+ @Overridepublic long longValue(MemBuffer buf, int off) {return buf.getAddress().getOffset() + off;}+ @Overridepublic int length(MemBuffer buf, int off) { return 0;}}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/sleighbase/address_set.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/sleighbase/address_set.javaindex 6ffe1a82a3..da6b5d23ab 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/sleighbase/address_set.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/sleighbase/address_set.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -29,6 +28,7 @@ public class address_set extends SetSTL<VarnodeSymbol>{}class VarnodeSymbolCompare implements Comparator<VarnodeSymbol> {+ @Overridepublic int compare( VarnodeSymbol op1, VarnodeSymbol op2 ) {return op1.getFixedVarnode().compareTo(op2.getFixedVarnode());}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/DirectoryVisitor.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/DirectoryVisitor.javaindex cdcab314a4..db1b523b37 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/DirectoryVisitor.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/DirectoryVisitor.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.@@ -70,7 +70,8 @@ public class DirectoryVisitor implements Iterable<File> {this.compareCase = compareCase;}- public Iterator<File> iterator() {+ @Override+ public Iterator<File> iterator() {return new BreadthFirstDirectoryVisitor(startingDirectories, directoryFilter, filter, compareCase);}@@ -82,19 +83,22 @@ public class DirectoryVisitor implements Iterable<File> {private final Comparator<File> comparator;private static final Comparator<File> CASE_SENSITIVE = new Comparator<File>() {- public int compare(File o1, File o2) {+ @Override+ public int compare(File o1, File o2) {return o1.getName().compareTo(o2.getName());}};private static final Comparator<File> CASE_INSENSITIVE = new Comparator<File>() {- public int compare(File o1, File o2) {+ @Override+ public int compare(File o1, File o2) {return o1.getName().compareToIgnoreCase(o2.getName());}};private static final FileFilter DIRECTORIES = new FileFilter() {- public boolean accept(File pathname) {+ @Override+ public boolean accept(File pathname) {return pathname.isDirectory();}};@@ -104,7 +108,8 @@ public class DirectoryVisitor implements Iterable<File> {boolean compareCase) {this.directoryFilter = directoryFilter == null ? DIRECTORIES: new FileFilter() {- public boolean accept(File pathname) {+ @Override+ public boolean accept(File pathname) {return pathname.isDirectory()&& directoryFilter.accept(pathname);}@@ -147,17 +152,20 @@ public class DirectoryVisitor implements Iterable<File> {}}- public boolean hasNext() {+ @Override+ public boolean hasNext() {ensureNextFileIsPresentInQueue();return !fileQueue.isEmpty();}- public File next() {+ @Override+ public File next() {ensureNextFileIsPresentInQueue();return fileQueue.removeFirst();}- public void remove() {+ @Override+ public void remove() {throw new UnsupportedOperationException();}}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompilePreprocessorDefinitionsAdapater.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompilePreprocessorDefinitionsAdapater.javaindex 5ab9197dfb..9b4f3a9aab 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompilePreprocessorDefinitionsAdapater.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompilePreprocessorDefinitionsAdapater.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -27,15 +26,18 @@ public class SleighCompilePreprocessorDefinitionsAdapater implementsthis.sleighCompile = sleighCompile;}- public Pair<Boolean, String> lookup(String key) {+ @Override+ public Pair<Boolean, String> lookup(String key) {return sleighCompile.getPreprocValue(key);}- public void set(String key, String value) {+ @Override+ public void set(String key, String value) {sleighCompile.setPreprocValue(key, value);}- public void undefine(String key) {+ @Override+ public void undefine(String key) {sleighCompile.undefinePreprocValue(key);}}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghsymbol/SymbolTree.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghsymbol/SymbolTree.javaindex 3ce7c3a05b..4cd436486a 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghsymbol/SymbolTree.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghsymbol/SymbolTree.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -28,6 +27,7 @@ public class SymbolTree extends SetSTL<SleighSymbol>{}class SymbolCompare implements Comparator<SleighSymbol> {+ @Overridepublic int compare( SleighSymbol o1, SleighSymbol o2 ) {return o1.getName().compareTo(o2.getName());}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentsDBAdapterV0.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentsDBAdapterV0.javaindex b2961aa84d..e29f37dd5a 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentsDBAdapterV0.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentsDBAdapterV0.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.@@ -238,6 +238,7 @@ class CommentsDBAdapterV0 extends CommentsDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#delete()*/+ @Overridepublic boolean delete() throws IOException {return false;}@@ -245,6 +246,7 @@ class CommentsDBAdapterV0 extends CommentsDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#hasNext()*/+ @Overridepublic boolean hasNext() throws IOException {return it.hasNext();}@@ -252,6 +254,7 @@ class CommentsDBAdapterV0 extends CommentsDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#hasPrevious()*/+ @Overridepublic boolean hasPrevious() throws IOException {return it.hasPrevious();}@@ -259,6 +262,7 @@ class CommentsDBAdapterV0 extends CommentsDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#next()*/+ @Overridepublic DBRecord next() throws IOException {DBRecord rec = it.next();return adaptRecord(rec);@@ -267,6 +271,7 @@ class CommentsDBAdapterV0 extends CommentsDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#previous()*/+ @Overridepublic DBRecord previous() throws IOException {DBRecord rec = it.previous();return adaptRecord(rec);diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataFilteredCodeUnitIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataFilteredCodeUnitIterator.javaindex e5dee97474..b22cffbad0 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataFilteredCodeUnitIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataFilteredCodeUnitIterator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -36,6 +35,7 @@ public class DataFilteredCodeUnitIterator implements DataIterator {/*** @see java.util.Iterator#remove()*/+ @Overridepublic void remove() {throw new UnsupportedOperationException();}@@ -43,6 +43,7 @@ public class DataFilteredCodeUnitIterator implements DataIterator {/*** @see ghidra.program.model.listing.DataIterator#hasNext()*/+ @Overridepublic boolean hasNext() {if (nextData == null) {findNext();@@ -53,6 +54,7 @@ public class DataFilteredCodeUnitIterator implements DataIterator {/*** @see ghidra.program.model.listing.DataIterator#next()*/+ @Overridepublic Data next() {if (hasNext()) {Data ret = nextData;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataKeyIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataKeyIterator.javaindex c8873e0255..75947b3eff 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataKeyIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataKeyIterator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -48,6 +47,7 @@ public class DataKeyIterator implements DataIterator {/*** @see java.util.Iterator#remove()*/+ @Overridepublic void remove() {throw new UnsupportedOperationException();}@@ -55,6 +55,7 @@ public class DataKeyIterator implements DataIterator {/*** @see ghidra.program.model.listing.CodeUnitIterator#hasNext()*/+ @Overridepublic boolean hasNext() {if (nextCu == null) {findNext();@@ -65,6 +66,7 @@ public class DataKeyIterator implements DataIterator {/*** @see ghidra.program.model.listing.CodeUnitIterator#next()*/+ @Overridepublic Data next() {if (hasNext()) {Data ret = nextCu;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataRecordIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataRecordIterator.javaindex d6a9461ad4..8a2a393f3f 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataRecordIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataRecordIterator.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.@@ -48,6 +48,7 @@ public class DataRecordIterator implements DataIterator {/*** @see java.util.Iterator#remove()*/+ @Overridepublic void remove() {throw new UnsupportedOperationException();}@@ -55,6 +56,7 @@ public class DataRecordIterator implements DataIterator {/*** @see ghidra.program.model.listing.CodeUnitIterator#hasNext()*/+ @Overridepublic boolean hasNext() {if (nextData == null) {findNext();@@ -65,6 +67,7 @@ public class DataRecordIterator implements DataIterator {/*** @see ghidra.program.model.listing.CodeUnitIterator#next()*/+ @Overridepublic Data next() {if (hasNext()) {Data ret = nextData;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstDBAdapterV0.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstDBAdapterV0.javaindex 4dfc15b36d..3bed65c830 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstDBAdapterV0.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstDBAdapterV0.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.@@ -225,6 +225,7 @@ class InstDBAdapterV0 extends InstDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#delete()*/+ @Overridepublic boolean delete() throws IOException {return false;}@@ -232,6 +233,7 @@ class InstDBAdapterV0 extends InstDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#hasNext()*/+ @Overridepublic boolean hasNext() throws IOException {return it.hasNext();}@@ -239,6 +241,7 @@ class InstDBAdapterV0 extends InstDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#hasPrevious()*/+ @Overridepublic boolean hasPrevious() throws IOException {return it.hasPrevious();}@@ -246,6 +249,7 @@ class InstDBAdapterV0 extends InstDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#next()*/+ @Overridepublic DBRecord next() throws IOException {DBRecord rec = it.next();return adaptRecord(rec);@@ -254,6 +258,7 @@ class InstDBAdapterV0 extends InstDBAdapter {/*** @see ghidra.framework.store.db.RecordIterator#previous()*/+ @Overridepublic DBRecord previous() throws IOException {DBRecord rec = it.previous();return adaptRecord(rec);diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/ProtoDBAdapterV0.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/ProtoDBAdapterV0.javaindex 04172f633f..299cb1face 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/ProtoDBAdapterV0.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/ProtoDBAdapterV0.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.@@ -41,6 +41,7 @@ class ProtoDBAdapterV0 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getVersion()*/+ @Overridepublic int getVersion() {return 0;}@@ -60,6 +61,7 @@ class ProtoDBAdapterV0 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#createRecord(int, byte[])*/+ @Overridepublic void createRecord(int protoID, long addr, byte[] b, boolean inDelaySlot)throws IOException {throw new UnsupportedOperationException("Cannot create records with old schema");@@ -68,6 +70,7 @@ class ProtoDBAdapterV0 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#deleteAll()*/+ @Overridepublic void deleteAll() {throw new UnsupportedOperationException();}@@ -75,6 +78,7 @@ class ProtoDBAdapterV0 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getKey()*/+ @Overridepublic long getKey() throws IOException {return table.getKey();}@@ -82,6 +86,7 @@ class ProtoDBAdapterV0 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getNumRecords()*/+ @Overridepublic int getNumRecords() throws IOException {return table.getRecordCount();}@@ -89,6 +94,7 @@ class ProtoDBAdapterV0 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getRecord(int)*/+ @Overridepublic DBRecord getRecord(int protoId) throws IOException {return convertRecord(table.getRecord(protoId));}@@ -107,6 +113,7 @@ class ProtoDBAdapterV0 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getRecords()*/+ @Overridepublic RecordIterator getRecords() throws IOException {return new RecordUpdateIterator(table.iterator());}@@ -118,22 +125,27 @@ class ProtoDBAdapterV0 implements ProtoDBAdapter {this.it = it;}+ @Overridepublic boolean delete() throws IOException {throw new UnsupportedOperationException();}+ @Overridepublic boolean hasNext() throws IOException {return it.hasNext();}+ @Overridepublic boolean hasPrevious() throws IOException {return it.hasPrevious();}+ @Overridepublic DBRecord next() throws IOException {return convertRecord(it.next());}+ @Overridepublic DBRecord previous() throws IOException {DBRecord rec = it.previous();long key = rec.getKey();diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/ProtoDBAdapterV1.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/ProtoDBAdapterV1.javaindex 3e2cb10c4c..8f7d246691 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/ProtoDBAdapterV1.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/ProtoDBAdapterV1.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.@@ -36,6 +36,7 @@ class ProtoDBAdapterV1 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getVersion()*/+ @Overridepublic int getVersion() {return 1;}@@ -43,6 +44,7 @@ class ProtoDBAdapterV1 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getNumRecords()*/+ @Overridepublic int getNumRecords() throws IOException {return table.getRecordCount();}@@ -62,6 +64,7 @@ class ProtoDBAdapterV1 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#createRecord(int, byte[])*/+ @Overridepublic void createRecord(int protoID, long addr, byte[] b, boolean inDelaySlot)throws IOException {@@ -75,6 +78,7 @@ class ProtoDBAdapterV1 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getKey()*/+ @Overridepublic long getKey() throws IOException {return table.getKey();}@@ -82,6 +86,7 @@ class ProtoDBAdapterV1 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getRecord(int)*/+ @Overridepublic DBRecord getRecord(int protoId) throws IOException {return table.getRecord(protoId);}@@ -89,6 +94,7 @@ class ProtoDBAdapterV1 implements ProtoDBAdapter {/*** @see ghidra.program.database.code.ProtoDBAdapter#getRecords()*/+ @Overridepublic RecordIterator getRecords() throws IOException {return table.iterator();}@@ -96,6 +102,7 @@ class ProtoDBAdapterV1 implements ProtoDBAdapter {/**s* @see ghidra.program.database.code.ProtoDBAdapter#deleteAll()*/+ @Overridepublic void deleteAll() throws IOException {table.deleteAll();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapterV0.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapterV0.javaindex 7d481edce2..a5266b6271 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapterV0.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapterV0.java@@ -61,6 +61,7 @@ class CompositeDBAdapterV0 extends CompositeDBAdapter implements RecordTranslato}}+ @Overrideint getVersion() {return compositeTable.getSchema().getVersion();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapterV1.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapterV1.javaindex ce4ffcb2f8..4b83f7ff31 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapterV1.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapterV1.java@@ -67,6 +67,7 @@ class CompositeDBAdapterV1 extends CompositeDBAdapter implements RecordTranslato}}+ @Overrideint getVersion() {return compositeTable.getSchema().getVersion();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumValueDBAdapterV0.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumValueDBAdapterV0.javaindex 2eba78eef1..7408a27e42 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumValueDBAdapterV0.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumValueDBAdapterV0.java@@ -80,6 +80,7 @@ class EnumValueDBAdapterV0 extends EnumValueDBAdapter {return table.findRecords(new LongField(enumID), ENUMVAL_ID_COL);}+ @Overridevoid deleteTable(DBHandle handle) throws IOException {handle.deleteTable(ENUM_VALUE_TABLE_NAME);}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumValueDBAdapterV1.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumValueDBAdapterV1.javaindex 1739cfeab7..88d723b498 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumValueDBAdapterV1.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumValueDBAdapterV1.java@@ -98,6 +98,7 @@ class EnumValueDBAdapterV1 extends EnumValueDBAdapter {return table.iterator();}+ @Overridevoid deleteTable(DBHandle handle) throws IOException {handle.deleteTable(table.getName());}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SourceArchiveDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SourceArchiveDB.javaindex cbc1c60130..14c4ed9ea5 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SourceArchiveDB.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SourceArchiveDB.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.@@ -46,6 +46,7 @@ public class SourceArchiveDB extends DatabaseObject implements SourceArchive {* Gets the ID that the program has associated with the data type archive.* @return the data type archive ID*/+ @Overridepublic UniversalID getSourceArchiveID() {if (isLocal()) {// if this sourceArchive represents the local archive (id == LOCAL_ARCHIVE_KEY)@@ -67,6 +68,7 @@ public class SourceArchiveDB extends DatabaseObject implements SourceArchive {* Gets the ID used to uniquely identify the domain file for the data type archive.* @return the domain file identifier*/+ @Overridepublic String getDomainFileID() {if (isLocal()) {return dtMgr.getDomainFileID();@@ -79,6 +81,7 @@ public class SourceArchiveDB extends DatabaseObject implements SourceArchive {* (PROGRAM_TYPE, PROJECT_TYPE, FILE_TYPE)* @return the type*/+ @Overridepublic ArchiveType getArchiveType() {if (isLocal()) {return dtMgr.getType();@@ -87,6 +90,7 @@ public class SourceArchiveDB extends DatabaseObject implements SourceArchive {return ArchiveType.values()[byteValue];}+ @Overridepublic String getName() {if (isLocal()) {return dtMgr.getName();@@ -109,14 +113,17 @@ public class SourceArchiveDB extends DatabaseObject implements SourceArchive {return false;}+ @Overridepublic long getLastSyncTime() {return record.getLongValue(SourceArchiveAdapter.ARCHIVE_ID_LAST_SYNC_TIME_COL);}+ @Overridepublic boolean isDirty() {return record.getBooleanValue(SourceArchiveAdapter.ARCHIVE_ID_DIRTY_FLAG_COL);}+ @Overridepublic void setLastSyncTime(long syncTime) {lock.acquire();try {@@ -133,6 +140,7 @@ public class SourceArchiveDB extends DatabaseObject implements SourceArchive {}}+ @Overridepublic void setDirtyFlag(boolean isDirty) {lock.acquire();try {@@ -149,6 +157,7 @@ public class SourceArchiveDB extends DatabaseObject implements SourceArchive {}}+ @Overridepublic void setName(String newName) {if (getName().equals(newName)) {return;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SourceArchiveUpgradeMap.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SourceArchiveUpgradeMap.javaindex 745a69d886..07659a4563 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SourceArchiveUpgradeMap.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SourceArchiveUpgradeMap.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.@@ -95,36 +95,45 @@ public class SourceArchiveUpgradeMap {archiveName = "";}+ @Overridepublic ArchiveType getArchiveType() {return ArchiveType.FILE;}+ @Overridepublic String getDomainFileID() {return null;}+ @Overridepublic long getLastSyncTime() {return 0;}+ @Overridepublic String getName() {return archiveName;}+ @Overridepublic UniversalID getSourceArchiveID() {return id;}+ @Overridepublic boolean isDirty() {return false;}+ @Overridepublic void setDirtyFlag(boolean dirty) {}+ @Overridepublic void setLastSyncTime(long time) {}+ @Overridepublic void setName(String name) {}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/oldfunction/OldFunctionDBAdapterV0.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/oldfunction/OldFunctionDBAdapterV0.javaindex 9737493968..478f1cb7a3 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/oldfunction/OldFunctionDBAdapterV0.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/oldfunction/OldFunctionDBAdapterV0.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.@@ -113,23 +113,28 @@ class OldFunctionDBAdapterV0 extends OldFunctionDBAdapter {this.it = it;}+ @Overridepublic boolean delete() throws IOException {throw new UnsupportedOperationException();}+ @Overridepublic boolean hasNext() throws IOException {return it.hasNext();}+ @Overridepublic boolean hasPrevious() throws IOException {return it.hasPrevious();}+ @Overridepublic DBRecord next() throws IOException {DBRecord rec = it.next();return translate(rec);}+ @Overridepublic DBRecord previous() throws IOException {DBRecord rec = it.previous();return translate(rec);diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ShiftedReferenceDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ShiftedReferenceDB.javaindex 5b07e4f3c6..4d225cb453 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ShiftedReferenceDB.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ShiftedReferenceDB.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.@@ -30,6 +30,7 @@ class ShiftedReferenceDB extends MemReferenceDB implements ShiftedReference {/*** @see ghidra.program.model.symbol.ShiftedReference#getShift()*/+ @Overridepublic int getShift() {return (int) offsetOrShift;}@@ -37,6 +38,7 @@ class ShiftedReferenceDB extends MemReferenceDB implements ShiftedReference {/*** @see ghidra.program.model.symbol.ShiftedReference#getValue()*/+ @Overridepublic long getValue() {return toAddr.getOffset() >> (int) offsetOrShift;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/StackReferenceDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/StackReferenceDB.javaindex 9eb7a1ebb7..ecf9589d73 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/StackReferenceDB.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/StackReferenceDB.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -30,6 +29,7 @@ class StackReferenceDB extends MemReferenceDB implements StackReference {/*** @see ghidra.program.model.symbol.StackReference#getStackOffset()*/+ @Overridepublic int getStackOffset() {return (int) toAddr.getOffset();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/IndexToAddressRangeIteratorAdapter.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/IndexToAddressRangeIteratorAdapter.javaindex 09b77dace8..1f0568d66e 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/IndexToAddressRangeIteratorAdapter.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/IndexToAddressRangeIteratorAdapter.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -38,10 +37,12 @@ public class IndexToAddressRangeIteratorAdapter implements AddressRangeIteratorthis.it = it;}+ @Overridepublic Iterator<AddressRange> iterator() {return this;}+ @Overridepublic void remove() {throw new UnsupportedOperationException();}@@ -49,6 +50,7 @@ public class IndexToAddressRangeIteratorAdapter implements AddressRangeIterator/*** @see ghidra.program.model.address.AddressRangeIterator#hasNext()*/+ @Overridepublic boolean hasNext() {return it.hasNext();}@@ -56,6 +58,7 @@ public class IndexToAddressRangeIteratorAdapter implements AddressRangeIterator/*** @see ghidra.program.model.address.AddressRangeIterator#next()*/+ @Overridepublic AddressRange next() {IndexRange indexRange = it.next();Address start = map.decodeAddress(indexRange.getStart());diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/EquateRefDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/EquateRefDB.javaindex 00a6513cb3..10f4691c07 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/EquateRefDB.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/EquateRefDB.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.@@ -60,17 +60,20 @@ class EquateRefDB extends DatabaseObject implements EquateReference {return record.getLongValue(EquateRefDBAdapter.EQUATE_ID_COL);}+ @Overridepublic Address getAddress() {checkIsValid();long addr = record.getLongValue(EquateRefDBAdapter.ADDR_COL);return addrMap.decodeAddress(addr);}+ @Overridepublic short getOpIndex() {checkIsValid();return record.getShortValue(EquateRefDBAdapter.OP_INDEX_COL);}+ @Overridepublic long getDynamicHashValue() {checkIsValid();return record.getLongValue(EquateRefDBAdapter.HASH_COL);diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/LibraryDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/LibraryDB.javaindex 11426af7aa..70a0d0acee 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/LibraryDB.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/LibraryDB.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.@@ -43,6 +43,7 @@ class LibraryDB implements Library {/*** @see ghidra.program.model.symbol.Namespace#getSymbol()*/+ @Overridepublic Symbol getSymbol() {return symbol;}@@ -50,6 +51,7 @@ class LibraryDB implements Library {/*** @see ghidra.program.model.symbol.Namespace#getName()*/+ @Overridepublic String getName() {return symbol.getName();}@@ -57,6 +59,7 @@ class LibraryDB implements Library {/*** @see ghidra.program.model.symbol.Namespace#getID()*/+ @Overridepublic long getID() {return symbol.getID();}@@ -64,6 +67,7 @@ class LibraryDB implements Library {/*** @see ghidra.program.model.symbol.Namespace#getParentNamespace()*/+ @Overridepublic Namespace getParentNamespace() {return symbol.getParentNamespace();}@@ -71,6 +75,7 @@ class LibraryDB implements Library {/*** @see ghidra.program.model.symbol.Namespace#getBody()*/+ @Overridepublic AddressSetView getBody() {return namespaceMgr.getAddressSet(this);}@@ -78,6 +83,7 @@ class LibraryDB implements Library {/*** @see ghidra.program.model.symbol.Namespace#getName(boolean)*/+ @Overridepublic String getName(boolean includeNamespacePath) {return symbol.getName(includeNamespacePath);}@@ -101,6 +107,7 @@ class LibraryDB implements Library {/*** @see ghidra.program.model.symbol.Namespace#setParentNamespace(ghidra.program.model.symbol.Namespace)*/+ @Overridepublic void setParentNamespace(Namespace parentNamespace) throws DuplicateNameException,InvalidInputException, CircularDependencyException {symbol.setNamespace(parentNamespace);diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/NamespaceDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/NamespaceDB.javaindex aff7af0610..454c07a534 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/NamespaceDB.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/NamespaceDB.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -45,6 +44,7 @@ class NamespaceDB implements Namespace {/*** @see ghidra.program.model.symbol.Namespace#getSymbol()*/+ @Overridepublic Symbol getSymbol() {return symbol;}@@ -52,6 +52,7 @@ class NamespaceDB implements Namespace {/*** @see ghidra.program.model.symbol.Namespace#getName()*/+ @Overridepublic String getName() {return symbol.getName();}@@ -59,6 +60,7 @@ class NamespaceDB implements Namespace {/*** @see ghidra.program.model.symbol.Namespace#getID()*/+ @Overridepublic long getID() {return symbol.getID();}@@ -66,6 +68,7 @@ class NamespaceDB implements Namespace {/*** @see ghidra.program.model.symbol.Namespace#getParentNamespace()*/+ @Overridepublic Namespace getParentNamespace() {return symbol.getParentNamespace();}@@ -73,6 +76,7 @@ class NamespaceDB implements Namespace {/*** @see ghidra.program.model.symbol.Namespace#getBody()*/+ @Overridepublic AddressSetView getBody() {return namespaceMgr.getAddressSet(this);}@@ -80,6 +84,7 @@ class NamespaceDB implements Namespace {/*** @see ghidra.program.model.symbol.Namespace#getName(boolean)*/+ @Overridepublic String getName(boolean includeNamespacePath) {return symbol.getName(includeNamespacePath);}@@ -103,6 +108,7 @@ class NamespaceDB implements Namespace {/*** @see ghidra.program.model.symbol.Namespace#setParentNamespace(ghidra.program.model.symbol.Namespace)*/+ @Overridepublic void setParentNamespace(Namespace parentNamespace) throws DuplicateNameException,InvalidInputException, CircularDependencyException {symbol.setNamespace(parentNamespace);diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/TypeFilteredSymbolIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/TypeFilteredSymbolIterator.javaindex edf11fe631..c3d54c214d 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/TypeFilteredSymbolIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/TypeFilteredSymbolIterator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -41,6 +40,7 @@ public class TypeFilteredSymbolIterator implements SymbolIterator {/*** @see ghidra.program.model.symbol.SymbolIterator#hasNext()*/+ @Overridepublic boolean hasNext() {if (nextSymbol != null) {return true;@@ -51,6 +51,7 @@ public class TypeFilteredSymbolIterator implements SymbolIterator {/*** @see ghidra.program.model.symbol.SymbolIterator#next()*/+ @Overridepublic Symbol next() {if (hasNext()) {Symbol s = nextSymbol;@@ -71,6 +72,7 @@ public class TypeFilteredSymbolIterator implements SymbolIterator {return false;}+ @Overridepublic void remove() {throw new UnsupportedOperationException();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AndQuery.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AndQuery.javaindex 197e0e48ae..73a3302ec5 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AndQuery.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AndQuery.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.@@ -38,6 +38,7 @@ public class AndQuery implements Query {/*** @see ghidra.program.database.util.Query#matches(db.DBRecord)*/+ @Overridepublic boolean matches(DBRecord record) {return q1.matches(record) && q2.matches(record);}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/EmptyRecordIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/EmptyRecordIterator.javaindex c375046e05..c8903a836d 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/EmptyRecordIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/EmptyRecordIterator.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.@@ -30,6 +30,7 @@ public class EmptyRecordIterator implements RecordIterator {/*** @see db.RecordIterator#hasNext()*/+ @Overridepublic boolean hasNext() throws IOException {return false;}@@ -37,6 +38,7 @@ public class EmptyRecordIterator implements RecordIterator {/*** @see db.RecordIterator#hasPrevious()*/+ @Overridepublic boolean hasPrevious() throws IOException {return false;}@@ -44,6 +46,7 @@ public class EmptyRecordIterator implements RecordIterator {/*** @see db.RecordIterator#next()*/+ @Overridepublic DBRecord next() throws IOException {return null;}@@ -51,6 +54,7 @@ public class EmptyRecordIterator implements RecordIterator {/*** @see db.RecordIterator#previous()*/+ @Overridepublic DBRecord previous() throws IOException {return null;}@@ -58,6 +62,7 @@ public class EmptyRecordIterator implements RecordIterator {/*** @see db.RecordIterator#delete()*/+ @Overridepublic boolean delete() throws IOException {return false;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/FieldMatchQuery.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/FieldMatchQuery.javaindex 3354255afe..fffd608856 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/FieldMatchQuery.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/FieldMatchQuery.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.@@ -38,6 +38,7 @@ public class FieldMatchQuery implements Query {/*** @see ghidra.program.database.util.Query#matches(db.DBRecord)*/+ @Overridepublic boolean matches(DBRecord record) {return record.fieldEquals(column, value);}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/FieldRangeQuery.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/FieldRangeQuery.javaindex eca18ff310..b4b65df564 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/FieldRangeQuery.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/FieldRangeQuery.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.@@ -42,6 +42,7 @@ public class FieldRangeQuery implements Query {/*** @see ghidra.program.database.util.Query#matches(db.DBRecord)*/+ @Overridepublic boolean matches(DBRecord record) {return (record.compareFieldTo(column, min) > 0) && (record.compareFieldTo(column, max) < 0);}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/NotQuery.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/NotQuery.javaindex 9955146237..2ba46fba2a 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/NotQuery.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/NotQuery.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.@@ -34,6 +34,7 @@ public class NotQuery implements Query {/*** @see ghidra.program.database.util.Query#matches(db.DBRecord)*/+ @Overridepublic boolean matches(DBRecord record) {return !q1.matches(record);}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/OrQuery.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/OrQuery.javaindex 13cc349bbc..3de2f09a3f 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/OrQuery.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/OrQuery.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.@@ -38,6 +38,7 @@ public class OrQuery implements Query {/*** @see ghidra.program.database.util.Query#matches(db.DBRecord)*/+ @Overridepublic boolean matches(DBRecord record) {return q1.matches(record) || q2.matches(record);}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/QueryRecordIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/QueryRecordIterator.javaindex 1337e13211..fdf91153a5 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/QueryRecordIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/QueryRecordIterator.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.@@ -57,6 +57,7 @@ public class QueryRecordIterator implements RecordIterator {/*** @see db.RecordIterator#hasNext()*/+ @Overridepublic boolean hasNext() throws IOException {if (record == null) {if (forward) {@@ -72,6 +73,7 @@ public class QueryRecordIterator implements RecordIterator {/*** @see db.RecordIterator#next()*/+ @Overridepublic DBRecord next() throws IOException {if (hasNext()) {DBRecord rec = record;@@ -84,6 +86,7 @@ public class QueryRecordIterator implements RecordIterator {/*** @see db.RecordIterator#hasPrevious()*/+ @Overridepublic boolean hasPrevious() throws IOException {if (record == null) {findPrevious();@@ -94,6 +97,7 @@ public class QueryRecordIterator implements RecordIterator {/*** @see db.RecordIterator#previous()*/+ @Overridepublic DBRecord previous() throws IOException {if (hasPrevious()) {DBRecord rec = record;@@ -106,6 +110,7 @@ public class QueryRecordIterator implements RecordIterator {/*** @see db.RecordIterator#delete()*/+ @Overridepublic boolean delete() throws IOException {return iter.delete();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerMessageListener.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerMessageListener.javaindex 43dfb35959..0d0e79e2ba 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerMessageListener.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerMessageListener.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -26,7 +25,8 @@ public interface DisassemblerMessageListener {* Ignores all messages from the disassembler.*/public final static DisassemblerMessageListener IGNORE = new DisassemblerMessageListener() {- public void disassembleMessageReported(String msg) {//don't care...+ @Override+ public void disassembleMessageReported(String msg) {//don't care...}};@@ -34,6 +34,7 @@ public interface DisassemblerMessageListener {* Writes all messages from disassembler to the console.*/public final static DisassemblerMessageListener CONSOLE = new DisassemblerMessageListener() {+ @Overridepublic void disassembleMessageReported(String msg) {Msg.debug(this, "DisassemblerMessageListener: "+msg);}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressRangeToAddressComparator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressRangeToAddressComparator.javaindex 92c3304a58..75b231a7c6 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressRangeToAddressComparator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressRangeToAddressComparator.java@@ -29,7 +29,8 @@ public class AddressRangeToAddressComparator implements Comparator<Object> {* @return a negative integer, zero, or a positive integer* if the first argument is less than, equal to, or greater than the second.*/- public int compare(Object obj1, Object obj2) {+ @Override+ public int compare(Object obj1, Object obj2) {if(obj1 instanceof AddressRange) {return ((AddressRange) obj1).compareTo((Address) obj2);}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/EmptyAddressRangeIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/EmptyAddressRangeIterator.javaindex 79ea596783..a7b5db2f59 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/EmptyAddressRangeIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/EmptyAddressRangeIterator.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.@@ -25,6 +25,7 @@ public class EmptyAddressRangeIterator implements AddressRangeIterator {/*** @see ghidra.program.model.address.AddressIterator#next()*/+ @Overridepublic AddressRange next() {return null;}@@ -32,6 +33,7 @@ public class EmptyAddressRangeIterator implements AddressRangeIterator {/*** @see ghidra.program.model.address.AddressIterator#hasNext()*/+ @Overridepublic boolean hasNext() {return false;}@@ -39,6 +41,7 @@ public class EmptyAddressRangeIterator implements AddressRangeIterator {/*** @see java.util.Iterator#remove()*/+ @Overridepublic void remove() {throw new UnsupportedOperationException();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleDestReferenceIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleDestReferenceIterator.javaindex 926e042318..e2a6504a1e 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleDestReferenceIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleDestReferenceIterator.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.@@ -53,7 +53,8 @@ public class SimpleDestReferenceIterator implements CodeBlockReferenceIterator {/*** @see ghidra.program.model.block.CodeBlockReferenceIterator#next()*/- public CodeBlockReference next() throws CancelledException {+ @Override+ public CodeBlockReference next() throws CancelledException {monitor.checkCancelled();return blockRefQueue.isEmpty() ? null : blockRefQueue.removeFirst();}@@ -61,7 +62,8 @@ public class SimpleDestReferenceIterator implements CodeBlockReferenceIterator {/*** @see ghidra.program.model.block.CodeBlockReferenceIterator#hasNext()*/- public boolean hasNext() throws CancelledException {+ @Override+ public boolean hasNext() throws CancelledException {monitor.checkCancelled();return !blockRefQueue.isEmpty();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleSourceReferenceIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleSourceReferenceIterator.javaindex 954f3f2572..6cc28c92d3 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleSourceReferenceIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleSourceReferenceIterator.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.@@ -53,7 +53,8 @@ public class SimpleSourceReferenceIterator implements CodeBlockReferenceIterator/*** @see ghidra.program.model.block.CodeBlockReferenceIterator#next()*/- public CodeBlockReference next() throws CancelledException {+ @Override+ public CodeBlockReference next() throws CancelledException {monitor.checkCancelled();return (blockRefQueue.isEmpty() ? null : blockRefQueue.removeFirst());}@@ -61,7 +62,8 @@ public class SimpleSourceReferenceIterator implements CodeBlockReferenceIterator/*** @see ghidra.program.model.block.CodeBlockReferenceIterator#hasNext()*/- public boolean hasNext() throws CancelledException {+ @Override+ public boolean hasNext() throws CancelledException {monitor.checkCancelled();return !blockRefQueue.isEmpty();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineDestReferenceIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineDestReferenceIterator.javaindex d14eeb3598..4a55cce13d 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineDestReferenceIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineDestReferenceIterator.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.@@ -50,7 +50,8 @@ public class SubroutineDestReferenceIterator implements CodeBlockReferenceIterat/*** @see ghidra.program.model.block.CodeBlockReferenceIterator#next()*/- public CodeBlockReference next() throws CancelledException {+ @Override+ public CodeBlockReference next() throws CancelledException {monitor.checkCancelled();return blockRefQueue.isEmpty() ? null : blockRefQueue.removeFirst();}@@ -58,7 +59,8 @@ public class SubroutineDestReferenceIterator implements CodeBlockReferenceIterat/*** @see ghidra.program.model.block.CodeBlockReferenceIterator#hasNext()*/- public boolean hasNext() throws CancelledException {+ @Override+ public boolean hasNext() throws CancelledException {monitor.checkCancelled();return !blockRefQueue.isEmpty();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineSourceReferenceIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineSourceReferenceIterator.javaindex 8c0bfd98a3..c6c324f7b0 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineSourceReferenceIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineSourceReferenceIterator.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.@@ -50,7 +50,8 @@ public class SubroutineSourceReferenceIterator implements CodeBlockReferenceIter/*** @see ghidra.program.model.block.CodeBlockReferenceIterator#next()*/- public CodeBlockReference next() throws CancelledException {+ @Override+ public CodeBlockReference next() throws CancelledException {monitor.checkCancelled();return (blockRefQueue.isEmpty() ? null : blockRefQueue.removeFirst());}@@ -58,7 +59,8 @@ public class SubroutineSourceReferenceIterator implements CodeBlockReferenceIter/*** @see ghidra.program.model.block.CodeBlockReferenceIterator#hasNext()*/- public boolean hasNext() throws CancelledException {+ @Override+ public boolean hasNext() throws CancelledException {monitor.checkCancelled();return !blockRefQueue.isEmpty();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractPointerTypedefBuiltIn.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractPointerTypedefBuiltIn.javaindex 954f940567..bec0eacae9 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractPointerTypedefBuiltIn.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractPointerTypedefBuiltIn.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.@@ -97,6 +97,7 @@ public abstract class AbstractPointerTypedefBuiltIn extends BuiltIn implements Treturn ptrType.getDataType();}+ @Overridepublic UniversalID getUniversalID() {return universalId;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AnnotationHandler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AnnotationHandler.javaindex 8d6cb1a32b..88f7f1e4a6 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AnnotationHandler.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AnnotationHandler.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -82,5 +81,6 @@ public interface AnnotationHandler extends ExtensionPoint {* Returns a string description of this handler.* @return a string description of this handler*/+ @Overridepublic String toString();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DefaultAnnotationHandler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DefaultAnnotationHandler.javaindex 5d0b50127d..195fdbd467 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DefaultAnnotationHandler.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DefaultAnnotationHandler.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -19,30 +18,37 @@ package ghidra.program.model.data;public class DefaultAnnotationHandler implements AnnotationHandler {private static final String[] FILE_EXTENSIONS = new String[] { "c", "h", "cpp" };+ @Overridepublic String getPrefix(Enum e, String member) {return "";}+ @Overridepublic String getSuffix(Enum e, String member) {return "";}+ @Overridepublic String getPrefix(Composite c, DataTypeComponent dtc) {return "";}+ @Overridepublic String getSuffix(Composite c, DataTypeComponent dtc) {return "";}+ @Overridepublic String getDescription() {return "Default C Annotations";}+ @Overridepublic String getLanguageName() {return "C/C++";}+ @Overridepublic String[] getFileExtensions() {return FILE_EXTENSIONS;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DoubleDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DoubleDataType.javaindex 1066b0c21d..ac024f01d1 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DoubleDataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DoubleDataType.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.@@ -38,6 +38,7 @@ public class DoubleDataType extends AbstractFloatDataType {return "Compiler-defined 'double' " + super.buildDescription();}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/IconResource.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/IconResource.javaindex f4cf0656e2..9d32c3ef1c 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/IconResource.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/IconResource.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.@@ -30,6 +30,7 @@ public class IconResource extends BitmapResource {return height / 2;}+ @Overridepublic int getImageDataSize() {return getComputedUncompressedImageDataSize();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/LongDoubleDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/LongDoubleDataType.javaindex c8002be9d9..b8a2f8a5e3 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/LongDoubleDataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/LongDoubleDataType.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.@@ -38,6 +38,7 @@ public class LongDoubleDataType extends AbstractFloatDataType {return "Compiler-defined 'long double' " + super.buildDescription();}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/PointerTypedef.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/PointerTypedef.javaindex 99b09e1f1f..6ca283cca8 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/PointerTypedef.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/PointerTypedef.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.@@ -163,6 +163,7 @@ public class PointerTypedef extends GenericDataType implements TypeDef {return ptrType.getDataType();}+ @Overridepublic UniversalID getUniversalID() {return universalId;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatCountDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatCountDataType.javaindex 46e80f2411..cd66805f23 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatCountDataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatCountDataType.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.@@ -83,6 +83,7 @@ public abstract class RepeatCountDataType extends DynamicDataType {/* (non-Javadoc)* @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.program.model.lang.ProcessorContext, ghidra.program.model.data.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {return null;}@@ -90,6 +91,7 @@ public abstract class RepeatCountDataType extends DynamicDataType {/* (non-Javadoc)* @see ghidra.program.model.data.DataType#getRepresentation(ghidra.program.model.mem.MemBuffer, ghidra.program.model.lang.ProcessorContext, ghidra.program.model.data.Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {return "";}@@ -97,6 +99,7 @@ public abstract class RepeatCountDataType extends DynamicDataType {/* (non-Javadoc)* @see ghidra.program.model.data.DataType#getMnemonic(ghidra.program.model.data.Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedDynamicDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedDynamicDataType.javaindex ac269be21d..c43a33001f 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedDynamicDataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedDynamicDataType.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.@@ -127,6 +127,7 @@ public abstract class RepeatedDynamicDataType extends DynamicDataType {/*** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return description;}@@ -134,6 +135,7 @@ public abstract class RepeatedDynamicDataType extends DynamicDataType {/*** @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {return null;}@@ -141,10 +143,12 @@ public abstract class RepeatedDynamicDataType extends DynamicDataType {/*** @see ghidra.program.model.data.DataType#getRepresentation(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {return "";}+ @Overridepublic String getMnemonic(Settings settings) {return name;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedStringDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedStringDataType.javaindex a1cb467aae..403e146949 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedStringDataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedStringDataType.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -43,10 +42,12 @@ public class RepeatedStringDataType extends RepeatCountDataType {/*** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return "Repeated String";}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructuredDynamicDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructuredDynamicDataType.javaindex 0985d887e7..aba8a45c0a 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructuredDynamicDataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructuredDynamicDataType.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.@@ -126,6 +126,7 @@ public abstract class StructuredDynamicDataType extends DynamicDataType {/* (non-Javadoc)* @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return description;}@@ -133,6 +134,7 @@ public abstract class StructuredDynamicDataType extends DynamicDataType {/* (non-Javadoc)* @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.program.model.lang.ProcessorContext, ghidra.program.model.data.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {return null;}@@ -140,6 +142,7 @@ public abstract class StructuredDynamicDataType extends DynamicDataType {/* (non-Javadoc)* @see ghidra.program.model.data.DataType#getRepresentation(ghidra.program.model.mem.MemBuffer, ghidra.program.model.lang.ProcessorContext, ghidra.program.model.data.Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {return "";}@@ -147,6 +150,7 @@ public abstract class StructuredDynamicDataType extends DynamicDataType {/* (non-Javadoc)* @see ghidra.program.model.data.DataType#getMnemonic(ghidra.program.model.data.Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined1DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined1DataType.javaindex 1c035f6d43..0b7e937c73 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined1DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined1DataType.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.@@ -53,6 +53,7 @@ public class Undefined1DataType extends Undefined {** @see ghidra.program.model.data.DataType#getLength()*/+ @Overridepublic int getLength() {return 1;}@@ -61,6 +62,7 @@ public class Undefined1DataType extends Undefined {** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return "Undefined Byte";}@@ -69,6 +71,7 @@ public class Undefined1DataType extends Undefined {** @see ghidra.program.model.data.DataType#getMnemonic(Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}@@ -82,6 +85,7 @@ public class Undefined1DataType extends Undefined {** @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {String val = "??";@@ -100,6 +104,7 @@ public class Undefined1DataType extends Undefined {** @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {try {return new Scalar(8, getValue(buf));@@ -109,6 +114,7 @@ public class Undefined1DataType extends Undefined {}}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined2DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined2DataType.javaindex 00a835c6ce..3572588b46 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined2DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined2DataType.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.@@ -53,6 +53,7 @@ public class Undefined2DataType extends Undefined {** @see ghidra.program.model.data.DataType#getLength()*/+ @Overridepublic int getLength() {return 2;}@@ -61,6 +62,7 @@ public class Undefined2DataType extends Undefined {** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return "Undefined Word";}@@ -69,6 +71,7 @@ public class Undefined2DataType extends Undefined {** @see ghidra.program.model.data.DataType#getMnemonic(Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}@@ -82,6 +85,7 @@ public class Undefined2DataType extends Undefined {** @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {String val = "??";@@ -100,6 +104,7 @@ public class Undefined2DataType extends Undefined {** @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {try {return new Scalar(16, getValue(buf));@@ -109,6 +114,7 @@ public class Undefined2DataType extends Undefined {}}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined3DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined3DataType.javaindex 4526673b3b..13a015bc6e 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined3DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined3DataType.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.@@ -53,6 +53,7 @@ public class Undefined3DataType extends Undefined {** @see ghidra.program.model.data.DataType#getLength()*/+ @Overridepublic int getLength() {return 3;}@@ -61,6 +62,7 @@ public class Undefined3DataType extends Undefined {** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return "Undefined 3-Byte";}@@ -69,6 +71,7 @@ public class Undefined3DataType extends Undefined {** @see ghidra.program.model.data.DataType#getMnemonic(Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}@@ -82,6 +85,7 @@ public class Undefined3DataType extends Undefined {** @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {String val = "??";@@ -100,6 +104,7 @@ public class Undefined3DataType extends Undefined {** @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {try {return new Scalar(24, getValue(buf));@@ -109,6 +114,7 @@ public class Undefined3DataType extends Undefined {}}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined4DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined4DataType.javaindex 701d350687..43658e7a7c 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined4DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined4DataType.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.@@ -53,6 +53,7 @@ public class Undefined4DataType extends Undefined {** @see ghidra.program.model.data.DataType#getLength()*/+ @Overridepublic int getLength() {return 4;}@@ -61,10 +62,12 @@ public class Undefined4DataType extends Undefined {** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return "Undefined Double Word";}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;@@ -76,6 +79,7 @@ public class Undefined4DataType extends Undefined {** @see ghidra.program.model.data.DataType#getMnemonic(Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}@@ -89,6 +93,7 @@ public class Undefined4DataType extends Undefined {** @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {String val = "??";@@ -107,6 +112,7 @@ public class Undefined4DataType extends Undefined {** @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {try {return new Scalar(32, getValue(buf));diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined5DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined5DataType.javaindex 2ac54bebf5..2e6486f7b8 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined5DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined5DataType.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.@@ -53,6 +53,7 @@ public class Undefined5DataType extends Undefined {** @see ghidra.program.model.data.DataType#getLength()*/+ @Overridepublic int getLength() {return 5;}@@ -61,6 +62,7 @@ public class Undefined5DataType extends Undefined {** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return "Undefined 5-Byte";}@@ -69,6 +71,7 @@ public class Undefined5DataType extends Undefined {** @see ghidra.program.model.data.DataType#getMnemonic(Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}@@ -82,6 +85,7 @@ public class Undefined5DataType extends Undefined {** @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {String val = "??";@@ -100,6 +104,7 @@ public class Undefined5DataType extends Undefined {** @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {try {return new Scalar(40, getValue(buf));@@ -109,6 +114,7 @@ public class Undefined5DataType extends Undefined {}}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined6DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined6DataType.javaindex 733ecc2caf..2f983baaaf 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined6DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined6DataType.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.@@ -53,6 +53,7 @@ public class Undefined6DataType extends Undefined {** @see ghidra.program.model.data.DataType#getLength()*/+ @Overridepublic int getLength() {return 6;}@@ -61,6 +62,7 @@ public class Undefined6DataType extends Undefined {** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return "Undefined 6-Byte";}@@ -69,6 +71,7 @@ public class Undefined6DataType extends Undefined {** @see ghidra.program.model.data.DataType#getMnemonic(Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}@@ -82,6 +85,7 @@ public class Undefined6DataType extends Undefined {** @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {String val = "??";@@ -100,6 +104,7 @@ public class Undefined6DataType extends Undefined {** @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {try {return new Scalar(48, getValue(buf));@@ -109,6 +114,7 @@ public class Undefined6DataType extends Undefined {}}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined7DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined7DataType.javaindex 5fb268d35f..8da754aaa7 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined7DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined7DataType.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.@@ -53,6 +53,7 @@ public class Undefined7DataType extends Undefined {** @see ghidra.program.model.data.DataType#getLength()*/+ @Overridepublic int getLength() {return 7;}@@ -61,6 +62,7 @@ public class Undefined7DataType extends Undefined {** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return "Undefined 7-Byte";}@@ -69,6 +71,7 @@ public class Undefined7DataType extends Undefined {** @see ghidra.program.model.data.DataType#getMnemonic(Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}@@ -83,6 +86,7 @@ public class Undefined7DataType extends Undefined {** @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {String val = "??";@@ -101,6 +105,7 @@ public class Undefined7DataType extends Undefined {** @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {try {return new Scalar(56, getValue(buf));@@ -110,6 +115,7 @@ public class Undefined7DataType extends Undefined {}}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined8DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined8DataType.javaindex abfc5668be..afde350247 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined8DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Undefined8DataType.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.@@ -53,6 +53,7 @@ public class Undefined8DataType extends Undefined {** @see ghidra.program.model.data.DataType#getLength()*/+ @Overridepublic int getLength() {return 8;}@@ -61,6 +62,7 @@ public class Undefined8DataType extends Undefined {** @see ghidra.program.model.data.DataType#getDescription()*/+ @Overridepublic String getDescription() {return "Undefined Quad Word";}@@ -69,6 +71,7 @@ public class Undefined8DataType extends Undefined {** @see ghidra.program.model.data.DataType#getMnemonic(Settings)*/+ @Overridepublic String getMnemonic(Settings settings) {return name;}@@ -81,6 +84,7 @@ public class Undefined8DataType extends Undefined {** @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, Settings, int)*/+ @Overridepublic String getRepresentation(MemBuffer buf, Settings settings, int length) {String val = "??";@@ -99,6 +103,7 @@ public class Undefined8DataType extends Undefined {** @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int)*/+ @Overridepublic Object getValue(MemBuffer buf, Settings settings, int length) {try {return new Scalar(64, getValue(buf));@@ -108,6 +113,7 @@ public class Undefined8DataType extends Undefined {}}+ @Overridepublic DataType clone(DataTypeManager dtm) {if (dtm == getDataTypeManager()) {return this;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicCompilerSpecDescription.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicCompilerSpecDescription.javaindex 548826cc16..4b694a791e 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicCompilerSpecDescription.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicCompilerSpecDescription.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -25,14 +24,17 @@ public class BasicCompilerSpecDescription implements CompilerSpecDescription {this.name = name;}+ @Overridepublic CompilerSpecID getCompilerSpecID() {return id;}+ @Overridepublic String getCompilerSpecName() {return name;}+ @Overridepublic String getSource() {return getCompilerSpecID() + " " + getCompilerSpecName();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicLanguageDescription.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicLanguageDescription.javaindex 979883b899..8bcfa9aab5 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicLanguageDescription.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicLanguageDescription.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.@@ -86,10 +86,12 @@ public class BasicLanguageDescription implements LanguageDescription {this.externalNames = externalNames;}+ @Overridepublic String getDescription() {return description;}+ @Overridepublic Endian getEndian() {return endian;}@@ -104,34 +106,42 @@ public class BasicLanguageDescription implements LanguageDescription {return languageId;}+ @Overridepublic int getMinorVersion() {return minorVersion;}+ @Overridepublic int getVersion() {return version;}+ @Overridepublic Processor getProcessor() {return processor;}+ @Overridepublic int getSize() {return size;}+ @Overridepublic String getVariant() {return variant;}+ @Overridepublic boolean isDeprecated() {return deprecated;}+ @Overridepublic List<CompilerSpecDescription> getCompatibleCompilerSpecDescriptions() {return new ArrayList<CompilerSpecDescription>(compatibleCompilerSpecs.values());}+ @Overridepublic CompilerSpecDescription getCompilerSpecDescriptionByID(CompilerSpecID compilerSpecID)throws CompilerSpecNotFoundException {CompilerSpecDescription compilerSpecDescription =diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Mask.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Mask.javaindex b0990af369..aa59274859 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Mask.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Mask.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -33,6 +32,7 @@ public interface Mask {* @return true if the object is equal to this mask, false otherwise.*/+ @Overrideboolean equals(Object obj);/**diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/MaskImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/MaskImpl.javaindex bc34d58dcc..e0f6c2a340 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/MaskImpl.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/MaskImpl.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.@@ -58,6 +58,7 @@ public class MaskImpl implements Mask, Serializable {** @see ghidra.program.model.lang.Mask#equals(byte[])*/+ @Overridepublic boolean equals(byte[] otherMask) {if (otherMask == null || otherMask.length != mask.length) {return false;@@ -75,6 +76,7 @@ public class MaskImpl implements Mask, Serializable {** @see ghidra.program.model.lang.Mask#applyMask(byte[], byte[])*/+ @Overridepublic byte[] applyMask(byte[] cde, byte[] result) throws IncompatibleMaskException {if ((cde == null) || (result == null))throw new IncompatibleMaskException();@@ -102,6 +104,7 @@ public class MaskImpl implements Mask, Serializable {/*** @see ghidra.program.model.lang.Mask#applyMask(ghidra.program.model.mem.MemBuffer)*/+ @Overridepublic byte[] applyMask(MemBuffer buffer) throws MemoryAccessException {byte[] bytes = new byte[mask.length];buffer.getBytes(bytes, 0);@@ -115,6 +118,7 @@ public class MaskImpl implements Mask, Serializable {** @see ghidra.program.model.lang.Mask#equalMaskedValue(byte[], byte[])*/+ @Overridepublic boolean equalMaskedValue(byte[] cde, byte[] target) throws IncompatibleMaskException {if ((cde == null) || (target == null))throw new IncompatibleMaskException();@@ -130,6 +134,7 @@ public class MaskImpl implements Mask, Serializable {** @see ghidra.program.model.lang.Mask#subMask(byte[])*/+ @Overridepublic boolean subMask(byte[] msk) throws IncompatibleMaskException {if (msk == null)throw new IncompatibleMaskException();@@ -149,6 +154,7 @@ public class MaskImpl implements Mask, Serializable {** @see ghidra.program.model.lang.Mask#complementMask(byte[], byte[])*/+ @Overridepublic byte[] complementMask(byte[] msk, byte[] results) throws IncompatibleMaskException {if ((msk == null) || (results == null))throw new IncompatibleMaskException();@@ -194,6 +200,7 @@ public class MaskImpl implements Mask, Serializable {** @see ghidra.program.model.lang.Mask#getBytes()*/+ @Overridepublic byte[] getBytes() {return mask;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterTree.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterTree.javaindex 3c58ade416..bbb4971f3b 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterTree.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterTree.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -164,6 +163,7 @@ public class RegisterTree implements Comparable<RegisterTree> {/*** @see java.lang.Comparable#compareTo(java.lang.Object)*/+ @Overridepublic int compareTo(RegisterTree other) {return name.compareTo(other.name);}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkComparator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkComparator.javaindex 963827fdd1..979be2a2dc 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkComparator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkComparator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -31,6 +30,7 @@ public class BookmarkComparator implements Comparator<Bookmark> {* first argument is less than, equal to, or greater than the* second.*/+ @Overridepublic int compare(Bookmark bm1, Bookmark bm2) {String bt1 = bm1.getTypeString();String bt2 = bm2.getTypeString();diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkTypeComparator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkTypeComparator.javaindex c587cd5d03..bbee587ebf 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkTypeComparator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkTypeComparator.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -31,6 +30,7 @@ public class BookmarkTypeComparator implements Comparator<BookmarkType> {* first argument is less than, equal to, or greater than the* second.*/+ @Overridepublic int compare(BookmarkType bt1, BookmarkType bt2) {return bt1.getTypeString().compareTo(bt2.getTypeString());}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramFragment.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramFragment.javaindex a340802d1d..da740c6e4e 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramFragment.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramFragment.java@@ -39,7 +39,8 @@ public interface ProgramFragment extends Group, AddressSetView {** @return true if the code unit is in the fragment, false otherwise.*/- public boolean contains(CodeUnit codeUnit);+ @Override+ public boolean contains(CodeUnit codeUnit);/*** Returns a forward iterator over the code units making up this fragment.diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramModule.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramModule.javaindex d7773e2c3b..8930c8d290 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramModule.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramModule.java@@ -171,6 +171,7 @@ public interface ProgramModule extends Group {* @return the minimum address, this will be null if all of the module's* descendant fragments are empty.*/+ @Overridepublic Address getMinAddress();/**@@ -181,6 +182,7 @@ public interface ProgramModule extends Group {* @return the maximum address, this will be null if all of the module's* descendant fragments are empty.*/+ @Overridepublic Address getMaxAddress();/**diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ExternalLocationIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ExternalLocationIterator.javaindex 1724d76941..1e03cf1261 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ExternalLocationIterator.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ExternalLocationIterator.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.@@ -29,11 +29,13 @@ public interface ExternalLocationIterator extends Iterator<ExternalLocation> {/*** Returns true if another external location is available with the next() method.*/+ @Overridepublic boolean hasNext();/*** Returns the next external location*/+ @Overridepublic ExternalLocation next();}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/MemReferenceImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/MemReferenceImpl.javaindex 7876e2f395..52f58be4e2 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/MemReferenceImpl.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/MemReferenceImpl.java@@ -1,13 +1,12 @@/* ###* IP: GHIDRA- * REVIEWED: YES** 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.@@ -59,6 +58,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#getFromAddress()*/+ @Overridepublic Address getFromAddress() {return fromAddr;}@@ -66,6 +66,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#getToAddress()*/+ @Overridepublic Address getToAddress() {return toAddr;}@@ -73,6 +74,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#isPrimary()*/+ @Overridepublic boolean isPrimary() {return isPrimary;}@@ -80,6 +82,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#getSymbolID()*/+ @Overridepublic long getSymbolID() {return symbolID;}@@ -87,6 +90,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#getReferenceType()*/+ @Overridepublic RefType getReferenceType() {return refType;}@@ -94,6 +98,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#getOperandIndex()*/+ @Overridepublic int getOperandIndex() {return opIndex;}@@ -101,6 +106,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#isMnemonicReference()*/+ @Overridepublic boolean isMnemonicReference() {return !isOperandReference();}@@ -108,6 +114,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#isOperandReference()*/+ @Overridepublic boolean isOperandReference() {return opIndex >= 0;}@@ -115,6 +122,7 @@ public class MemReferenceImpl implements Reference {/*** @see java.lang.Comparable#compareTo(Object)*/+ @Overridepublic int compareTo(Reference ref) {int result = fromAddr.compareTo(ref.getFromAddress());if (result == 0) {@@ -156,6 +164,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#isExternalReference()*/+ @Overridepublic boolean isExternalReference() {return false;}@@ -163,6 +172,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#isOffsetReference()*/+ @Overridepublic boolean isOffsetReference() {return false;}@@ -170,6 +180,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#isShiftedReference()*/+ @Overridepublic boolean isShiftedReference() {return false;}@@ -177,13 +188,15 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#isEntryPointReference()*/- public boolean isEntryPointReference() {+ @Override+ public boolean isEntryPointReference() {return false;}/*** @see ghidra.program.model.symbol.Reference#isMemoryReference()*/+ @Overridepublic boolean isMemoryReference() {return true;}@@ -191,6 +204,7 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#isRegisterReference()*/+ @Overridepublic boolean isRegisterReference() {return false;}@@ -198,10 +212,12 @@ public class MemReferenceImpl implements Reference {/*** @see ghidra.program.model.symbol.Reference#isStackReference()*/+ @Overridepublic boolean isStackReference() {return false;}+ @Overridepublic SourceType getSource() {return sourceType;}diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/OffsetReference.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/OffsetReference.javaindex c94b8532a9..164b410ff0 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/OffsetReference.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/OffsetReference.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.@@ -46,6 +46,7 @@ public interface OffsetReference extends Reference {* of the offset value.* @return reference "to" address*/+ @Overridepublic Address getToAddress();}diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/sleigh/grammar/BooleanExpressionDefTest.java b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/sleigh/grammar/BooleanExpressionDefTest.javaindex 2b65f375ae..5891807124 100644--- a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/sleigh/grammar/BooleanExpressionDefTest.java+++ b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/sleigh/grammar/BooleanExpressionDefTest.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.@@ -39,14 +39,16 @@ public class BooleanExpressionDefTest extends AbstractGenericTest {CommonTokenStream tokenStream = new CommonTokenStream(lexer);parser = new BooleanExpressionParser(tokenStream);parser.env = new ExpressionEnvironment() {- public boolean equals(String lhs, String rhs) {+ @Override+ public boolean equals(String lhs, String rhs) {if (lhs == null || rhs == null) {return false;}return lhs.equals(rhs);}- public String lookup(String variable) {+ @Override+ public String lookup(String variable) {if (variable.startsWith("A")) {return variable;}diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/sleigh/grammar/BooleanExpressionTest.java b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/sleigh/grammar/BooleanExpressionTest.javaindex 71bbd5bb75..cf024909bb 100644--- a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/sleigh/grammar/BooleanExpressionTest.java+++ b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/sleigh/grammar/BooleanExpressionTest.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.@@ -39,14 +39,16 @@ public class BooleanExpressionTest extends AbstractGenericTest {CommonTokenStream tokenStream = new CommonTokenStream(lexer);parser = new BooleanExpressionParser(tokenStream);parser.env = new ExpressionEnvironment() {- public boolean equals(String lhs, String rhs) {+ @Override+ public boolean equals(String lhs, String rhs) {if (lhs == null || rhs == null) {return false;}return lhs.equals(rhs);}- public String lookup(String variable) {+ @Override+ public String lookup(String variable) {return variable;}diff --git a/Ghidra/Processors/AARCH64/src/main/java/ghidra/program/emulation/AARCH64EmulateInstructionStateModifier.java b/Ghidra/Processors/AARCH64/src/main/java/ghidra/program/emulation/AARCH64EmulateInstructionStateModifier.javaindex f2f9a5513b..783502fdd1 100644--- a/Ghidra/Processors/AARCH64/src/main/java/ghidra/program/emulation/AARCH64EmulateInstructionStateModifier.java+++ b/Ghidra/Processors/AARCH64/src/main/java/ghidra/program/emulation/AARCH64EmulateInstructionStateModifier.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.@@ -980,6 +980,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt// extended, so truncate to the smaller of s_size and d_sizeprivate class SIMD_INT_ZEXT extends SIMD_UOP1E {+ @Overrideprotected long op1e(long x, int s_size, int d_size) { return x & getmask(s_size) & getmask(d_size); }}@@ -988,6 +989,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt// be truncated to the output sizeprivate class SIMD_INT_SEXT extends SIMD_SOP1E {+ @Overrideprotected long op1e(long x, int s_size, int d_size) { return x & getmask(d_size); }}@@ -1015,11 +1017,13 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_INT_ABS extends SIMD_SOP1 {+ @Overrideprotected long op1(long x, int esize) { return (x < 0) ? -x : x; }}@SuppressWarnings("unused")private class SIMD_INT_ADD extends SIMD_SOP2 {+ @Overrideprotected long op2(long x, long y, int esize) { return x + y; }}@@ -1030,10 +1034,12 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_INT_SUB extends SIMD_SOP2 {+ @Overrideprotected long op2(long x, long y, int esize) { return x - y; }}private class SIMD_INT_2COMP extends SIMD_SOP1 {+ @Overrideprotected long op1(long x, int esize) { return -x; }}@@ -1080,6 +1086,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_INT_NEGATE extends SIMD_UOP1 {+ @Overrideprotected long op1(long x, int esize) { return ~x; }}@@ -1115,22 +1122,27 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_INT_XOR extends SIMD_UOP2 {+ @Overrideprotected long op2(long x, long y, int esize) { return x ^ y; }}private class SIMD_INT_AND extends SIMD_UOP2 {+ @Overrideprotected long op2(long x, long y, int esize) { return x & y; }}private class SIMD_INT_OR extends SIMD_UOP2 {+ @Overrideprotected long op2(long x, long y, int esize) { return x | y; }}private class SIMD_INT_LEFT extends SIMD_UOP2 {+ @Overrideprotected long op2(long x, long y, int esize) { return x << y; }}private class SIMD_INT_RIGHT extends SIMD_SOP2 {+ @Overrideprotected long op2(long x, long y, int esize) { return x >>> y; }}@@ -1169,10 +1181,12 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_INT_SRIGHT extends SIMD_UOP2 {+ @Overrideprotected long op2(long x, long y, int esize) { return x >> y; }}private class SIMD_INT_MULT extends SIMD_SOP2 {+ @Overrideprotected long op2(long x, long y, int esize) { return x * y; }}@@ -1237,6 +1251,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_FLOAT_ADD extends SIMD_UOP2 {+ @Overrideprotected long op2(long x, long y, int esize) {if (esize == 2) {float fx = shortBitsToFloat(x);@@ -1307,6 +1322,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_FLOAT_DIV extends SIMD_UOP2 {+ @Overrideprotected long op2(long x, long y, int esize) {if (esize == 2) {float fx = shortBitsToFloat(x);@@ -1329,6 +1345,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_FLOAT_MULT extends SIMD_UOP2 {+ @Overrideprotected long op2(long x, long y, int esize) {if (esize == 2) {float fx = shortBitsToFloat(x);@@ -1351,6 +1368,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_FLOAT_SUB extends SIMD_UOP2 {+ @Overrideprotected long op2(long x, long y, int esize) {if (esize == 2) {float fx = shortBitsToFloat(x);@@ -1373,6 +1391,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_FLOAT_NEG extends SIMD_UOP1 {+ @Overrideprotected long op1(long x, int esize) {if (esize == 2) {float fx = shortBitsToFloat(x);@@ -1392,6 +1411,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_FLOAT_ABS extends SIMD_UOP1 {+ @Overrideprotected long op1(long x, int esize) {if (esize == 2) {float fx = shortBitsToFloat(x);@@ -1411,6 +1431,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_FLOAT2FLOAT extends SIMD_UOP1E {+ @Overrideprotected long op1e(long x, int s_size, int d_size) {if (s_size == d_size) return x;if (s_size == 2) {@@ -1431,6 +1452,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt}private class SIMD_TRUNC extends SIMD_UOP1E {+ @Overrideprotected long op1e(long x, int s_size, int d_size) {if (s_size == d_size) return x;if (s_size == 2) {@@ -1452,6 +1474,7 @@ public class AARCH64EmulateInstructionStateModifier extends EmulateInstructionSt@SuppressWarnings("unused")private class SIMD_FLOAT_ROUND extends SIMD_UOP1E {+ @Overrideprotected long op1e(long x, int s_size, int d_size) {if (s_size == 2) {float fx = shortBitsToFloat(x);diff --git a/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_32_O0_EmulatorTest.java b/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_32_O0_EmulatorTest.javaindex f8f5e88d75..bceef7a812 100644--- a/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_32_O0_EmulatorTest.java+++ b/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_32_O0_EmulatorTest.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.@@ -36,6 +36,7 @@ public class SparcV9_32_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {return "sparcV9_32_GCC_O0";}+ @Overrideprotected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {testRunner.setRegister("DECOMPILE_MODE", 0x0); // turn decompile mode off}diff --git a/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_32_O3_EmulatorTest.java b/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_32_O3_EmulatorTest.javaindex e959c430e3..1654b0ccfb 100644--- a/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_32_O3_EmulatorTest.java+++ b/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_32_O3_EmulatorTest.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.@@ -36,6 +36,7 @@ public class SparcV9_32_O3_EmulatorTest extends ProcessorEmulatorTestAdapter {return "sparcV9_32_GCC_O3";}+ @Overrideprotected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {testRunner.setRegister("DECOMPILE_MODE", 0x0); // turn decompile mode off}diff --git a/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_64_O0_EmulatorTest.java b/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_64_O0_EmulatorTest.javaindex 31bb61b0e5..06b4ec4edb 100644--- a/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_64_O0_EmulatorTest.java+++ b/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_64_O0_EmulatorTest.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.@@ -36,6 +36,7 @@ public class SparcV9_64_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {return "sparcV9_64_GCC_O0";}+ @Overrideprotected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {testRunner.setRegister("DECOMPILE_MODE", 0x0); // turn decompile mode off}diff --git a/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_64_O3_EmulatorTest.java b/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_64_O3_EmulatorTest.javaindex a68eff42b4..7b5f3d36aa 100644--- a/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_64_O3_EmulatorTest.java+++ b/Ghidra/Processors/Sparc/src/test.processors/java/ghidra/test/processors/SparcV9_64_O3_EmulatorTest.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.@@ -36,6 +36,7 @@ public class SparcV9_64_O3_EmulatorTest extends ProcessorEmulatorTestAdapter {return "sparcV9_64_GCC_O3";}+ @Overrideprotected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {testRunner.setRegister("DECOMPILE_MODE", 0x0); // turn decompile mode off}diff --git a/Ghidra/Processors/tricore/src/test.processors/java/ghidra/test/processors/TRICORE_BE_O0_EmulatorTest.java b/Ghidra/Processors/tricore/src/test.processors/java/ghidra/test/processors/TRICORE_BE_O0_EmulatorTest.javaindex e5fdb78d97..995d33ecd5 100644--- a/Ghidra/Processors/tricore/src/test.processors/java/ghidra/test/processors/TRICORE_BE_O0_EmulatorTest.java+++ b/Ghidra/Processors/tricore/src/test.processors/java/ghidra/test/processors/TRICORE_BE_O0_EmulatorTest.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.@@ -30,8 +30,10 @@ public class TRICORE_BE_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {super(name, LANGUAGE_ID, COMPILER_SPEC_ID, REG_DUMP_SET);}+ @Overrideprotected String getProcessorDesignator() { return "tricore_GCC_O0"; }+ @Overrideprotected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {testRunner.setRegister("a10", 0x40000000L); // stack, unused locationtestRunner.setRegister("FCX", 0x00020000L); // free context list start, unused location@@ -43,6 +45,7 @@ public class TRICORE_BE_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(TRICORE_BE_O0_EmulatorTest.class);}+ @Overrideprotected void setAnalysisOptions(Options analysisOptions) {super.setAnalysisOptions(analysisOptions);analysisOptions.setBoolean("Reference", false); // too many bad disassembliesdiff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction2Test.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction2Test.javaindex 32f289971b..110ae7c3c0 100644--- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction2Test.java+++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction2Test.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.@@ -486,6 +486,7 @@ public class VersionControlAction2Test extends AbstractVersionControlActionTest* @param icon the icon to get a URL for* @return the URL for the given icon*/+ @Overridepublic URL getURL(Icon icon) {if (icon instanceof UrlImageIcon urlIcon) {return urlIcon.getUrl();diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/GhidraRootPreferencePage.java b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/GhidraRootPreferencePage.javaindex 4dc5d8d530..78a692a2bd 100644--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/GhidraRootPreferencePage.java+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/GhidraRootPreferencePage.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.@@ -27,6 +27,7 @@ public class GhidraRootPreferencePage extends PreferencePage implements IWorkbennoDefaultAndApplyButton();}+ @Overridepublic void init(IWorkbench workbench) {setDescription("Please see subcategories for Ghidra preferences.");}