yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +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/Project/src/main/java/ghidra/framework/main/FrontEndTool.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.
@ -80,7 +80,7 @@ import help.Help;
import help.HelpService;
/**
* Tool that serves as the the Ghidra Project Window. Only those plugins that
* Tool that serves as the Ghidra Project Window. Only those plugins that
* implement the FrontEndable interface may be <i>directly</i> added to this
* tool by the user. Other plugins that are not marked as FrontEndable may get
* pulled in because the FrontEndable plugins depend on them. These plugins are

6
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FVTable.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.
@ -527,7 +527,7 @@ public class FVTable extends GTable
// selected end position if the shift key is down.
//
// However, if the user is selecting a row ABOVE the currently-selected one(s), then
// leave the the that row as the 'end' selection and reset the start.
// leave that row as the 'end' selection and reset the start.
//
// Also, if the mouse is dragging, don't reset the start position as the user is selecting
// a range via the mouse.

6
Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainObjectListenerBuilder.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.
@ -66,7 +66,7 @@ import utility.function.Callback;
* </PRE>
* <P>
* And finally, the third way is where you have to perform some processing on each record of a
* certain type. This can be done using the the {@link #each(EventType...)}, followed by the
* certain type. This can be done using the {@link #each(EventType...)}, followed by the
* {@link EachBuilder#call(Consumer)} if you just want the record, or
* {@link EachBuilder#call(BiConsumer)} if you want the record and the event.
* <P>

6
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginManager.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.
@ -631,7 +631,7 @@ class PluginManager {
* @param usingPlugin the plugin whose used services should not be provided by any plugins in the list
* @param serviceProvidingPlugins the list of plugins that is being tested to see if they provide any
* services used by p;
* @return true if no plugins in the the list provide any services used by p.
* @return true if no plugins in the list provide any services used by p.
*/
private boolean checkServices(Plugin usingPlugin, List<Plugin> serviceProvidingPlugins) {
for (Class<?> usedService : usingPlugin.getServicesRequired()) {

6
Ghidra/Framework/Project/src/main/java/ghidra/framework/project/ProjectJarWriter.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 @@ class ProjectJarWriter extends JarWriter {
private static final String ORIGINAL_PROPERTIES_FILE_NAME = "original"+PROPERTIES_FILE_NAME;
/**
* @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.
*/
ProjectJarWriter(JarOutputStream jarOut) {

6
Ghidra/Framework/Project/src/main/java/ghidra/framework/task/GTaskManager.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.
@ -49,7 +49,7 @@ import ghidra.util.exception.CancelledException;
* <P>
* <U>Yielding to Other Tasks:</U><BR>
* While running, a GTask can call the method {@link #waitForHigherPriorityTasks()} on the GTaskManager,
* which will cause the the GTaskManager to run scheduled tasks (within the same group) that are
* which will cause the GTaskManager to run scheduled tasks (within the same group) that are
* a higher priority than the running task, effectively allowing the running task to yield until all
* higher priority tasks are executed.
*