yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-7225_hippietrail_the-the'

Browse source
This commit is contained in:
Ryan Kurtz 2024-11-26 09:05:43 -05:00
commit 2bebb96f77
208 changed files with 582 additions and 589 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Framework/Generic/src/main/java/generic/concurrent/QProgressListener.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.
@ -63,7 +63,7 @@ public interface QProgressListener<I> {
void progressMessageChanged(long id, I item, String message);
/**
* Notification the the max progress value has changed.
* Notification that the max progress value has changed.
* @param id the id of the item that has completed processing.
* @param item the item that was being processed when the worker changed the max progress.
* @param maxProgress the max value of the progress for this task.

6
Ghidra/Framework/Generic/src/main/java/generic/io/JarWriter.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.
@ -32,7 +32,7 @@ public class JarWriter {
private String[] excludedExtensions;
/**
* @param jarOut the the jar file output stream the zip entries are
* @param jarOut the jar file output stream the zip entries are
* to be written to.
*/
public JarWriter(JarOutputStream jarOut) {

7
Ghidra/Framework/Generic/src/main/java/generic/stl/IteratorSTL.java
View file

@ -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,7 +37,7 @@ public interface IteratorSTL<T> {
/**
* Advances the iterator to the next position.
* @return a reference to the iterator itself
* @throws IndexOutOfBoundsException if the the iterator is already past the last element.
* @throws IndexOutOfBoundsException if the iterator is already past the last element.
*/
IteratorSTL<T> increment();

6
Ghidra/Framework/Generic/src/main/java/generic/util/WindowUtilities.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.
@ -497,7 +497,7 @@ public class WindowUtilities {
// NOTE: we do an invokeLater here, as some of our clients are calling us in a
// WindowListener.windowActivated() callback. During this callback, it is possible that
// the focus owner is not correct, as it will be changed to the window under activation.
// If we invoke later, the the call will happen when focus has been transitioned.
// If we invoke later, then the call will happen when focus has been transitioned.
Swing.runLater(() -> doBringModalestDialogToFront(activeWindow));
}

4
Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java
View file

@ -917,7 +917,7 @@ public class Application {
}
/**
* Return the directory relative the the name module's data directory. (i.e. "/data" will
* Return the directory relative to the name module's data directory. (i.e. "/data" will
* be prepended to the given path)
* @param moduleName the name of the module.
* @param relativePath the path relative to the module's data directory.
@ -932,7 +932,7 @@ public class Application {
}
/**
* Return the directory relative the the name module's directory.
* Return the directory relative to the name module's directory.
* @param moduleName the name of the module.
* @param relativePath the path relative to the module's root directory.
* @return the directory

9
Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/BitTree.java
View file

@ -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.
@ -336,7 +335,7 @@ public class BitTree implements ShortKeySet, Serializable {
if(containsKey((short)0)) {
return (short)0;
}
// otherwise return the the next key after 0.
// otherwise return the next key after 0.
return getNext((short)0);
}
@ -373,7 +372,7 @@ public class BitTree implements ShortKeySet, Serializable {
}
/**
* Tests if the the nth bit is on.
* Tests if the nth bit is on.
*/
private boolean isBitSet(int n) {
int intIndex = n >> 5;

8
Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/SimpleWeightedDigraph.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.
@ -85,7 +85,7 @@ public class SimpleWeightedDigraph extends WeightedDigraph {
}
/**
* Add an edge with the the default edge weight.
* Add an edge with the default edge weight.
*
* If an edge from and to the vertices
* specified by the edge already exists in the graph,
@ -106,7 +106,7 @@ public class SimpleWeightedDigraph extends WeightedDigraph {
}
/**
* Add an edge with the the specified edge weight.
* Add an edge with the specified edge weight.
*
* If an edge from and to the vertices
* specified by the edge already exists in the graph,

6
Ghidra/Framework/Generic/src/test/java/ghidra/util/datastruct/TestDataStructureErrorHandlerInstaller.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.
@ -21,7 +21,7 @@ import generic.test.ConcurrentTestExceptionHandler;
* A utility that allows tests to set the error handling behavior for all data structures that
* want flexible error handling. This class, in this package, allows us to override the factory
* that is used to create the error handlers for framework listener data structures. The standard
* behavior is to report errors to the the application log. Some clients wish to change this
* behavior is to report errors to the application log. Some clients wish to change this
* behavior in testing mode so that any errors will fail tests. Without overriding this behavior,
* unexpected errors during listener notification may be lost in the noise of the application log.
* <p>