mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Fixing @Override warnings

Browse Source
This commit is contained in:
Ryan Kurtz
2025-05-29 06:16:20 -04:00
parent d4120b4b4d
commit a6cd5b5dbc
449 changed files with 2348 additions and 1276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Sarif/src/main/java/sarif/export/data/ExtIsfDataTypeWriter.java
View File

@@ -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;
}
@Override
public JsonObject getRootObject(TaskMonitor monitor) throws CancelledException, IOException {
genRoot(monitor);
return root;
@@ -133,6 +134,7 @@ public class ExtIsfDataTypeWriter extends IsfDataTypeWriter {
return new ExtIsfTypedefPointer(typeDef);
}
@Override
public IsfObject newTypedefUser(TypeDef typeDef, IsfObject object) {
return new ExtIsfTypedefUser(typeDef, object);
}

5
Ghidra/Features/Sarif/src/main/java/sarif/export/data/SarifDataTypeWriter.java
View File

@@ -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;
}
@Override
public JsonArray getResults() {
return types;
}

5
Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifClassesNamespaceWriter.java
View File

@@ -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 {
}
}
@Override
public JsonArray getResults() {
return objects;
}

5
Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifExternalLibraryWriter.java
View File

@@ -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 {
}
}
@Override
public JsonArray getResults() {
return objects;
}

5
Ghidra/Features/Sarif/src/main/java/sarif/export/func/SarifFunctionWriter.java
View File

@@ -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));
}
@Override
public JsonArray getResults() {
return objects;
}

5
Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateRefWriter.java
View File

@@ -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 {
}
}
@Override
public JsonArray getResults() {
return objects;
}

5
Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifEquateWriter.java
View File

@@ -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 {
}
}
@Override
public JsonArray getResults() {
return objects;
}

5
Ghidra/Features/Sarif/src/main/java/sarif/export/ref/SarifReferenceWriter.java
View File

@@ -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 {
}
}
@Override
public JsonArray getResults() {
return objects;
}

5
Ghidra/Features/Sarif/src/main/java/sarif/export/symbols/SarifSymbolWriter.java
View File

@@ -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));
}
@Override
public JsonArray getResults() {
return objects;
}

1
Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifProgramResultHandler.java
View File

@@ -87,6 +87,7 @@ public class SarifProgramResultHandler extends SarifResultHandler {
programMgr.addManagers();
}
@Override
protected void doRun(TaskMonitor monitor) {
int[] selected = provider.filterTable.getTable().getSelectedRows();
Map<String, List<Map<String, Object>>> results = new HashMap<>();

6
Ghidra/Features/Sarif/src/main/java/sarif/io/SarifGsonIO.java
View File

@@ -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 {
@Override
public SarifSchema210 readSarif(File file) throws JsonSyntaxException, IOException {
Gson gson = new Gson();
return gson.fromJson(Files.readString(file.toPath()), SarifSchema210.class);
}
@Override
public SarifSchema210 readSarif(String str) throws JsonSyntaxException, IOException {
Gson gson = new Gson();
return gson.fromJson(str, SarifSchema210.class);

6
Ghidra/Features/Sarif/src/main/java/sarif/io/SarifJacksonIO.java
View File

@@ -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 {
@Override
public 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");
}
@Override
public SarifSchema210 readSarif(String str) throws JsonSyntaxException, IOException {
// ObjectMapper mapper = new ObjectMapper();
// return mapper.readValue(str, SarifSchema210.class);

5
Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcOverlaySarifTest.java
View File

@@ -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());
}
@Override
protected Program getProgram(String progName) throws Exception {
return buildOverlayCalcExeProgram();
}

5
Ghidra/Features/Sarif/src/test/java/sarif/MergeCalcSarifTest.java
View File

@@ -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());
}
@Override
protected Program getProgram(String progName) throws Exception {
return buildCalcExeProgram();
}

6
Ghidra/Features/Sarif/src/test/java/sarif/MergeMipsSarifTest.java
View File

@@ -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());
}
@Override
protected Program getProgram(String progName) throws Exception {
return buildR4000Program();
}
@Override
public void reset() throws Exception {
if (program != null) {
if (txIdOut != -1) {

5
Ghidra/Features/Sarif/src/test/java/sarif/MergeNotepadSarifTest.java
View File

@@ -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());
}
@Override
protected Program getProgram(String progName) throws Exception {
return buildNotepadMergeListingTest_X86Program();
}

5
Ghidra/Features/Sarif/src/test/java/sarif/MergeWallaceSarifTest.java
View File

@@ -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());
}
@Override
protected Program getProgram(String progName) throws Exception {
return buildWallaceSrcProgram();
}