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

Test fixes

Browse source
This commit is contained in:
dragonmacher 2023-04-17 14:38:25 -04:00
parent a21c2c4347
commit 3c9dbf5414
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/Gui/data/gui.palette.theme.properties
View file

@ -110,7 +110,7 @@ color.palette.saddlebrown = burlywood // not sure; can change
color.palette.silver = dimgray // not sure; this may need to be darker
color.palette.tan = #635542 // less saturated tan
color.palette.teal = mediumseagreen
color.palette.yellow = mocassin
color.palette.yellow = moccasin
// non-standard
color.palette.lightcornflowerblue = cornflowerblue

2
Ghidra/Framework/Gui/src/main/java/generic/theme/ThemeManager.java
View file

@ -570,7 +570,7 @@ public abstract class ThemeManager {
}
protected void error(String message) {
Throwable t = ReflectionUtilities.createThrowableWithStackOlderThan(getClass());
Throwable t = ReflectionUtilities.createThrowableWithStackOlderThan(ThemeManager.class);
StackTraceElement[] trace = t.getStackTrace();
StackTraceElement[] filtered = ReflectionUtilities.filterStackTrace(trace, "java.",
"theme.Gui", "theme.ThemeManager", "theme.GColor");

12
Ghidra/Framework/Utility/src/main/java/utilities/util/reflection/ReflectionUtilities.java
View file

@ -21,7 +21,7 @@ import java.util.*;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import ghidra.util.exception.AssertException;
import ghidra.util.Msg;
public class ReflectionUtilities {
@ -240,13 +240,15 @@ public class ReflectionUtilities {
}
if (lastIgnoreIndex == -1) {
throw new AssertException("Did not find the following classes in the call stack: " +
Arrays.toString(classes));
Msg.error(ReflectionUtilities.class,
"Change call to ReflectionUtils. Did not find the " +
"following classes in the call stack: " + Arrays.toString(classes));
}
if (lastIgnoreIndex == trace.length - 1) {
throw new AssertException(
"Call stack only contains the classes to ignore: " + Arrays.toString(classes));
Msg.error(ReflectionUtilities.class,
"Change call to ReflectionUtils. Call stack only contains the classes to ignore: " +
Arrays.toString(classes));
}
int startIndex = lastIgnoreIndex + 1;