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

GP-205 - Structure Editor - fixed 'Edit Component' action to unroll the

Browse source 
edited data type

Closes #1633
This commit is contained in:
dragonmacher 2020-09-25 15:43:10 -04:00
parent e5358323d8
commit a703304bb4
6 changed files with 120 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java
View file

@ -55,6 +55,7 @@ import sun.awt.AppContext;
import utilities.util.FileUtilities;
import utilities.util.reflection.ReflectionUtilities;
import utility.application.ApplicationLayout;
import utility.function.ExceptionalCallback;
public abstract class AbstractGenericTest extends AbstractGTest {
@ -1115,23 +1116,32 @@ public abstract class AbstractGenericTest extends AbstractGTest {
}
/**
* Call this version of {@link #runSwing(Runnable)} when you expect your runnable to throw
* an exception
* @param runnable the runnable
* @param wait true signals to wait for the Swing operation to finish
* @throws Throwable any exception that is thrown on the Swing thread
* Call this version of {@link #runSwing(Runnable)} when you expect your runnable <b>may</b>
* throw exceptions
*
* @param callback the runnable code snippet to call
* @throws Exception any exception that is thrown on the Swing thread
*/
public static void runSwingWithExceptions(Runnable runnable, boolean wait) throws Throwable {
public static <E extends Exception> void runSwingWithException(ExceptionalCallback<E> callback)
throws Exception {
if (Swing.isSwingThread()) {
throw new AssertException("Unexpectedly called from the Swing thread");
}
ExceptionHandlingRunner exceptionHandlingRunner = new ExceptionHandlingRunner(runnable);
ExceptionHandlingRunner exceptionHandlingRunner = new ExceptionHandlingRunner(callback);
Throwable throwable = exceptionHandlingRunner.getException();
if (throwable != null) {
throw throwable;
if (throwable == null) {
return;
}
if (throwable instanceof Exception) {
// this is what the client expected
throw (Exception) throwable;
}
// a runtime exception; re-throw
throw new AssertException(throwable);
}
public static void runSwing(Runnable runnable, boolean wait) {
@ -1170,11 +1180,18 @@ public abstract class AbstractGenericTest extends AbstractGTest {
}
protected static class ExceptionHandlingRunner {
private final Runnable delegateRunnable;
private final ExceptionalCallback<? extends Exception> delegateCallback;
private Throwable exception;
ExceptionHandlingRunner(Runnable delegateRunnable) {
this.delegateRunnable = delegateRunnable;
this.delegateCallback = () -> {
delegateRunnable.run();
};
run();
}
ExceptionHandlingRunner(ExceptionalCallback<? extends Exception> delegateCallback) {
this.delegateCallback = delegateCallback;
run();
}
@ -1213,7 +1230,7 @@ public abstract class AbstractGenericTest extends AbstractGTest {
Runnable swingExceptionCatcher = () -> {
try {
delegateRunnable.run();
delegateCallback.call();
}
catch (Throwable t) {
exception = t;