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-2974: Fixing warnings

Browse Source
This commit is contained in:
Ryan Kurtz
2023-04-26 08:03:57 -04:00
parent 113156a19f
commit 7fa3389119
662 changed files with 2198 additions and 2216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/jungrapht/JgtNamedLayout.java
View File

@@ -104,7 +104,7 @@ public class JgtNamedLayout extends AbstractFGLayout {
Set<FGVertex> jungVertices = jGraph.vertexSet();
for (FGVertex fgVertex : jungVertices) {
monitor.checkCanceled();
monitor.checkCancelled();
Point point = layoutModel.get(fgVertex);
columns.put(point.x, 0);
@@ -114,7 +114,7 @@ public class JgtNamedLayout extends AbstractFGLayout {
Function<FGEdge, List<Point>> articulator = getArticulator(layoutAlgorithm);
Set<FGEdge> edges = jGraph.edgeSet();
for (FGEdge fgEdge : edges) {
monitor.checkCanceled();
monitor.checkCancelled();
List<Point> ariculations = articulator.apply(fgEdge);
for (Point point : ariculations) {
@@ -126,19 +126,19 @@ public class JgtNamedLayout extends AbstractFGLayout {
// translate the real coordinates to grid coordinates (row and column indices)
int counter = 0;
for (Double x : columns.keySet()) {
monitor.checkCanceled();
monitor.checkCancelled();
columns.put(x, counter++);
}
counter = 0;
for (Double y : rows.keySet()) {
monitor.checkCanceled();
monitor.checkCancelled();
rows.put(y, counter++);
}
jungVertices = jGraph.vertexSet();
for (FGVertex fgVertex : jungVertices) {
monitor.checkCanceled();
monitor.checkCancelled();
Point point = layoutModel.get(fgVertex);
grid.set(fgVertex, rows.get(point.y), columns.get(point.x));
@@ -146,7 +146,7 @@ public class JgtNamedLayout extends AbstractFGLayout {
edges = jGraph.edgeSet();
for (FGEdge fgEdge : edges) {
monitor.checkCanceled();
monitor.checkCancelled();
List<java.awt.Point> newPoints = new ArrayList<>();

2
Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/graph/layout/TestFGLayoutProvider.java
View File

@@ -246,7 +246,7 @@ public class TestFGLayoutProvider extends FGLayoutProvider {
// Route our edges!
//
for (FGEdge e : edges) {
monitor.checkCanceled();
monitor.checkCancelled();
FGVertex startVertex = e.getStart();
FGVertex endVertex = e.getEnd();