diff --git a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/breakpoint/LogicalBreakpoint.java b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/breakpoint/LogicalBreakpoint.java index ac4ed76b7f..17f7821399 100644 --- a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/breakpoint/LogicalBreakpoint.java +++ b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/breakpoint/LogicalBreakpoint.java @@ -540,7 +540,7 @@ public interface LogicalBreakpoint { Mode mode = this.mode.sameAddress(that.mode); Consistency consistency = this.consistency.sameAddress(that.consistency); return fromFields(mode, consistency); - }; + } /** * For logical breakpoints which appear at the same address, compose their state diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java index 400a3d163b..4e798c5837 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java @@ -498,7 +498,7 @@ public class DebuggerEmulationServicePlugin extends Plugin implements DebuggerEm /*TraceMemoryRegion region = current.getTrace() .getMemoryManager() .getRegionContaining(current.getSnap(), traceLoc.getAddress()); - return region != null && region.isExecute()*/; + return region != null && region.isExecute();*/ return true; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java index c5f2da9aa6..6fa2fdee4a 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.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,7 +75,7 @@ public abstract class AbstractBaseDBTraceDefinedUnitsView() { protected Address address = within.getX1(); protected boolean soughtNext = false; - protected Entry next = null;; + protected Entry next = null; private void checkSeekNext() { if (soughtNext) { diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java index c5b4ee9dc6..3bb1130189 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java @@ -680,7 +680,7 @@ public class DBTraceProgramView implements TraceProgramView { protected final DomainObjectEventQueues eventQueues; protected EventTranslator eventTranslator; private volatile boolean allAddressesValid; - private volatile AddressSetView allAddresses;; + private volatile AddressSetView allAddresses; protected final DBTraceProgramViewBookmarkManager bookmarkManager; protected final DBTraceProgramViewEquateTable equateTable; diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/target/path/PathFilter.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/target/path/PathFilter.java index 1223a11ff9..f45cd8e051 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/target/path/PathFilter.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/target/path/PathFilter.java @@ -117,7 +117,7 @@ public interface PathFilter { ListIterator iterator(T[] arr) { return iterator(Arrays.asList(arr)); - }; + } } static boolean keyMatches(String pat, String key) { diff --git a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/SimilarStartRowObject.java b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/SimilarStartRowObject.java index cd6e70d946..960d087a33 100644 --- a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/SimilarStartRowObject.java +++ b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/SimilarStartRowObject.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,4 +24,4 @@ import ghidra.program.model.address.Address; * @param numAgreements number of agreeing trees */ public record SimilarStartRowObject(Address funcStart, int numAgreements) { -}; +} diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java index d3942f0fef..561dec807a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java @@ -634,7 +634,6 @@ public class VarnodeContext implements ProcessorContext { stateLayer = null; layer--; } - ; if (stateLayer == null) { return null; 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.java index d9fd226962..5fe96d83a9 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 @@ -62,7 +62,7 @@ public class ClosedPatternTableModel extends ThreadedTableModelStub types("int", "void *", "size_t")); /** "Extern" declaration of {@code unix_write} */ final UseropDecl unix_write = userop(type("size_t"), "unix_write", - types("int", "void *", "size_t"));; + types("int", "void *", "size_t")); /** * Inline the gather or scatter pattern for an iovec syscall diff --git a/Ghidra/Features/SystemEmulation/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java b/Ghidra/Features/SystemEmulation/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java index 4ce89004b1..bce0110059 100644 --- a/Ghidra/Features/SystemEmulation/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java +++ b/Ghidra/Features/SystemEmulation/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java @@ -15,8 +15,7 @@ */ package ghidra.pcode.struct.sub; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles.Lookup; @@ -82,7 +81,7 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest @Test public void testUseRegister() throws Exception { StructuredSleigh ss = new TestStructuredSleigh() { - final Var vR0 = reg(r0, type("int"));; + final Var vR0 = reg(r0, type("int")); @StructuredUserop(type = "int") public void my_userop() { diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/VTOptionDefines.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/VTOptionDefines.java index 1ff621ca86..2732e3a7b4 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/VTOptionDefines.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/VTOptionDefines.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. @@ -15,16 +15,7 @@ */ package ghidra.feature.vt.gui.util; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.CallingConventionChoices; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.CommentChoices; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.FunctionNameChoices; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.FunctionSignatureChoices; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.HighestSourcePriorityChoices; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.LabelChoices; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.ParameterDataTypeChoices; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.ReplaceChoices; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.ReplaceDataChoices; -import ghidra.feature.vt.gui.util.VTMatchApplyChoices.SourcePriorityChoices; +import ghidra.feature.vt.gui.util.VTMatchApplyChoices.*; import ghidra.framework.options.Options; public class VTOptionDefines { @@ -200,7 +191,7 @@ public class VTOptionDefines { "Duplicate Function Correlator Minimum Function Length"; public static final String DUPE_FUNCTION_CORRELATOR_MIN_LEN_OPTION = AUTO_VT_OPTIONS_NAME + "." + AUTO_VT_DUPLICATE_FUNCTION_CORRELATOR + - "." + DUPE_FUNCTION_CORRELATOR_MIN_LEN_OPTION_TEXT;; + "." + DUPE_FUNCTION_CORRELATOR_MIN_LEN_OPTION_TEXT; public static final String REF_CORRELATOR_MIN_SCORE_OPTION_TEXT = "Reference Correlators Minimum Score"; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/PcodeMachine.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/PcodeMachine.java index c73096cc44..5e1897731d 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/PcodeMachine.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/PcodeMachine.java @@ -72,7 +72,6 @@ public interface PcodeMachine { private AccessKind(boolean trapsRead, boolean trapsWrite) { this.trapsRead = trapsRead; this.trapsWrite = trapsWrite; - ; } /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/decode/DecoderForOneStride.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/decode/DecoderForOneStride.java index 2bc192d6cc..46c360686d 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/decode/DecoderForOneStride.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/decode/DecoderForOneStride.java @@ -77,7 +77,7 @@ public class DecoderForOneStride { private final AddrCtx start; final List instructions = new ArrayList<>(); - final List opsForStride = new ArrayList<>();; + final List opsForStride = new ArrayList<>(); /** * Construct a stride decoder diff --git a/Ghidra/Framework/Help/src/main/java/help/PathKey.java b/Ghidra/Framework/Help/src/main/java/help/PathKey.java index 0896a22b8c..d3b6f15bbc 100644 --- a/Ghidra/Framework/Help/src/main/java/help/PathKey.java +++ b/Ghidra/Framework/Help/src/main/java/help/PathKey.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,7 +31,7 @@ public class PathKey { } public PathKey(String path) { - Objects.requireNonNull(path, "Path cannot be null");; + Objects.requireNonNull(path, "Path cannot be null"); this.path = path.replace('\\', '/'); } diff --git a/Ghidra/Processors/ARM/src/test.slow/java/ghidra/app/plugin/core/analysis/ArmBranchReturnDetectionTest.java b/Ghidra/Processors/ARM/src/test.slow/java/ghidra/app/plugin/core/analysis/ArmBranchReturnDetectionTest.java index edb3e6088d..4fa790b752 100644 --- a/Ghidra/Processors/ARM/src/test.slow/java/ghidra/app/plugin/core/analysis/ArmBranchReturnDetectionTest.java +++ b/Ghidra/Processors/ARM/src/test.slow/java/ghidra/app/plugin/core/analysis/ArmBranchReturnDetectionTest.java @@ -91,7 +91,7 @@ public class ArmBranchReturnDetectionTest extends AbstractGhidraHeadedIntegratio builder.disassemble("0x00015d9c", 27, true); builder.createFunction("0x00015d9c"); - builder.createLabel("0x00015d9c", "func1");; + builder.createLabel("0x00015d9c", "func1"); program = builder.getProgram(); diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/java/rmi/JavaMethodsTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/java/rmi/JavaMethodsTest.java index 74f2a769f6..03d45b55ee 100644 --- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/java/rmi/JavaMethodsTest.java +++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/java/rmi/JavaMethodsTest.java @@ -655,7 +655,6 @@ public class JavaMethodsTest extends AbstractJavaTraceRmiTest { txPut(conn, "Frames"); waitForValuesPass("VMs[].Threads[main].Stack[0]._display", pcs -> assertContainsString("checkAccess", pcs.get(0).getValue().toString())); - ; } } } diff --git a/GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/typestubs/PythonTypeStubElement.java b/GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/typestubs/PythonTypeStubElement.java index 1c60919318..283b454291 100644 --- a/GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/typestubs/PythonTypeStubElement.java +++ b/GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/typestubs/PythonTypeStubElement.java @@ -16,22 +16,10 @@ package ghidra.doclets.typestubs; import java.io.PrintWriter; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; +import java.util.*; -import javax.lang.model.element.Element; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.Name; -import javax.lang.model.element.PackageElement; -import javax.lang.model.element.QualifiedNameable; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.ArrayType; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.type.WildcardType; +import javax.lang.model.element.*; +import javax.lang.model.type.*; /** * Base class providing access to sanitized names (Python safe). @@ -313,7 +301,7 @@ abstract class PythonTypeStubElement { static void addNeededTypes(Set imports, TypeMirror type) { switch (type.getKind()) { case DECLARED: - DeclaredType dt = (DeclaredType) type;; + DeclaredType dt = (DeclaredType) type; imports.add((TypeElement) dt.asElement()); for (TypeMirror genericType : dt.getTypeArguments()) { addNeededTypes(imports, genericType);