Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-09-20 09:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-6885_RuffaloLavoisier_typo'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-09-04 11:07:28 -04:00
commit ba5b54ce2e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/test/TestEnv.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.
@ -362,7 +362,7 @@ public class TestEnv {
* @param ghidraClass The class of the dialog the user desires
* @param maxTimeMS The max amount of time in milliseconds to wait for the requested dialog
* to appear.
* @return The first occurrence of a dialog that extends the given <code>ghirdraClass</code>
* @return The first occurrence of a dialog that extends the given <code>ghidraClass</code>
* @deprecated use instead {@link AbstractDockingTest#waitForDialogComponent(Class)}
*/
@Deprecated

8
Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.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.
@ -582,7 +582,7 @@ public abstract class AbstractDockingTest extends AbstractGuiTest {
* Waits for the first window of the given class.
*
* @param ghidraClass The class of the dialog the user desires
* @return The first occurrence of a dialog that extends the given <code>ghirdraClass</code>
* @return The first occurrence of a dialog that extends the given <code>ghidraClass</code>
* @see #waitForDialogComponent(Window, Class, int)
*/
public static <T extends DialogComponentProvider> T waitForDialogComponent(
@ -598,7 +598,7 @@ public abstract class AbstractDockingTest extends AbstractGuiTest {
* @param clazz The class of the dialog the user desires
* @param timeoutMS The max amount of time in milliseconds to wait for the requested dialog
* to appear.
* @return The first occurrence of a dialog that extends the given <code>ghirdraClass</code>
* @return The first occurrence of a dialog that extends the given <code>ghidraClass</code>
* @deprecated Instead call one of the methods that does not take a timeout
* (we are standardizing timeouts). The timeouts passed to this method will
* be ignored in favor of the standard value.